js/deploy/easweb.ear/shr_web.war/addon/custom/js/perf/PerfEvaluObjectListEx.js

@@ -20,6 +20,23 @@ shr.defineClass("shr.perfweb.PerfEvaluObjectListEx", shr.perfweb.perfEvaObjectNe
             $("#grid").setGridParam().showCol("ProjectManagement.projectName");//显示
         }
         hrOrgUnit = shr.getUrlRequestParam("hrOrgId", window.location.href);
+		var fromPeriod = _self.initData.fromPeriod;
+		if(fromPeriod != null){
+		   shr.showConfirm("检测到当前周期无绩效人员，是否引用上一期周期人员数据！",
+				function(){
+					_self.remoteCall({
+						method: 'addFromPeriod',
+						param: {
+							custom_params: _self.initData.custom_params
+						},
+						async: false,
+						success: function (data) {
+							_self.reloadGrid();
+						}
+					});						 
+				}
+			);
+		}		
     },
     addPerjectPersonAction() {
         let perfPlanId = shr.getUrlRequestParam("perfPlanId", window.location.href);//获取考核计划

path/20250628/server/deploy/easweb.ear/shr_web.war/addon/customer/adminOrgAtsCalculate/atsResultSumCalDynamicListEx.js

@@ -1,9 +1,48 @@
+
 shr.defineClass("shr.custom.atsResultSumCalDynamicListEx", shr.ats.atsResultSumCalDynamicList, {
     initalizeDOM: function () {
         var _self = this;
+		_self.isHZ = 0;
         shr.custom.atsResultSumCalDynamicListEx.superClass.initalizeDOM.call(this);
         _self.adminOrgAtsCalculateAction();
     },
+	queryGrid: function() {
+		var showMsg = true;
+		if(this.isFirstLoad){
+			showMsg = false;
+		}
+		this.isFirstLoad = false;
+		var _self = this;
+		var attencePolicyRequired = shr.fastFilterValidateUtil.requiredValidate(this,{"name":"attencePolicy","errorMessage":jsBizMultLan.atsManager_atsResultSumDynamicList_i18n_0},showMsg);
+		if(attencePolicyRequired){
+			var dateRequired = shr.fastFilterValidateUtil.requiredValidate(this,{"name":this.dateSelectName,"errorMessage":jsBizMultLan.atsManager_atsResultSumDynamicList_i18n_1},showMsg);
+			if(!dateRequired){
+				return;
+			}
+			var currentPeriodId = shr.attenceCalCommon.getFilterParamValues("attendancePeriod");
+			if(_self.atsPeriodObj && currentPeriodId != _self.atsPeriodObj.id){
+				_self.setAttendancePeriod(currentPeriodId);
+			}
+			if(currentPeriodId && _self.isHZ == 1){
+				//查询是否有汇总数据
+				var isHZ = _self.getAllNewStatus();
+				if(isHZ == "true"){
+				   shr.showConfirm("检测到当前考勤周期有可明细汇总的数据,是否更新汇总！",
+						function(){
+							_self.mySaveDataSalary(2);				 
+						}
+					);
+				}	
+			}
+			if(currentPeriodId && _self.isHZ == 0){
+				_self.isHZ = 1;
+			}
+			shr.ats.atsResultBaseDynamicList.superClass.queryGrid.call(this);
+		}else {
+			_self.isHZ = 1;
+			return;
+		}
+	},
     adminOrgAtsCalculateAction() {
         that = this;
         $('#adminOrgAtsCalculate').parent().click(function () {
@@ -22,6 +61,102 @@ shr.defineClass("shr.custom.atsResultSumCalDynamicListEx", shr.ats.atsResultSumC
             }
            
         });
-    }
-
+    },
+	//汇总直接转薪资
+	mySaveDataSalary: function(salaryStatus){
+	  		var _self = this;
+			openLoader(1);
+			var serviceId = encodeURIComponent(shr.getUrlRequestParam("serviceId"));
+			var url = shr.getContextPath() + "/dynamic.do?uipk=com.kingdee.eas.hr.ats.app.AttenceResultSum.list$fragment&serviceId="+serviceId;
+			var methodName="saveSumResult";
+	
+			var fastFilterItems = _self.getFastFilterItems();
+			if( fastFilterItems == undefined){
+				fastFilterItems = "" ;
+			}
+			else {
+//				//改变过滤条件考勤周期ID
+				fastFilterItems["dateSet.date"] = {dataType:"Date",values:{startDate:this.atsPeriodObj.startDate,endDate:this.atsPeriodObj.endDate}};
+			}
+			
+			if(fastFilterItems["add"] == ""){
+				fastFilterItems["add"] = null;
+			}
+			//精确搜索
+			var filterItems = _self.getQuickFilterItems();
+			
+			 shr.remoteCall({
+					type:"post", 
+					url:url, 
+					method:methodName,
+					param : {
+								PersonJson : "All-new",
+								salaryPeriod:"",      //薪资周期
+								filterItems :filterItems,
+			    				fastFilterItems : $.toJSON(fastFilterItems)
+							},
+					success : function(response) {
+						if (response) {
+							if(methodName=="tranSalary"){
+								$("#calendar_info").dialog( "close" );
+							}
+							
+							var batchTipsData = _self.batchTipsDataHandler(response, null);
+		
+							$(_self).shrMessageTips({
+								isSuccess: batchTipsData.isSuccess,
+								successCount: batchTipsData.successCount,
+								failureCount: batchTipsData.failureCount,
+								confirmCallback: function () {	
+									$(_self).shrDetailTips({
+										tableData: batchTipsData.tmp,
+										successCount: batchTipsData.successCount,
+		            					failureCount: batchTipsData.failureCount,
+										colNamesData: batchTipsData.tableModel,
+										isSortable : _self.batchHandlerWhetherSortable(),
+										modalWidth: ''
+									}).shrDetailTips("open");					
+								},
+		
+								closeCallback: function () {
+									_self.reloadGrid();
+								}
+							}).shrMessageTips("open");				
+						} else {
+//							$(_self).shrMessageTips("_setDetailDisable");
+						}	
+					},
+					error: function(response) {
+						closeLoader();
+					},
+					complete : function() {
+						closeLoader();
+					}
+			 });	
+	  	},
+		getAllNewStatus:function(){  
+			var attendPeriodId = shr.attenceCalCommon.getFilterParamValues("attendancePeriod");	
+			var beginDate= this.atsPeriodObj.startDate;
+			var endDate= this.atsPeriodObj.endDate;
+			var attendPolicyId = shr.attenceCalCommon.getFilterParamValues("attencePolicy");			
+			var url = shr.getContextPath()+'/dynamic.do?method=getAllNewStatus'+"&uipk=com.kingdee.eas.hr.ats.app.AttenceResultSum.list&";
+			var isOk = '';
+			shr.ajax({
+				type:"post",
+				async:false,
+				url:url,
+				data:{
+					attendPeriodId : attendPeriodId,
+					attendPolicyId : attendPolicyId,
+					beginDate : beginDate,
+					endDate : endDate
+				},
+				success:function(res){
+					if(res){    
+						isOk = res.AllNewStatus;
+					}
+				}
+			});
+			return isOk;
+ 	}
 }); 

websrc/com/kingdee/eas/hr/perf/handler/PerfEvaluObjectListHandlerEx.java

@@ -248,7 +248,6 @@ public class PerfEvaluObjectListHandlerEx extends PerfEvaluObjectListHandler {
      * @param modelMap
      * @throws SHRWebException
      */
-
     public void checkCansetPerfRelationTypeAction(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap) throws SHRWebException {
         perfGoalsWorkListHandler p = new perfGoalsWorkListHandler();
         p.checkCansetPerfRelationTypeAction(request,response,modelMap);