优化修改

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml

@@ -563,12 +563,12 @@
 			if(a.IN_USE = 0,'可用','不可用') IN_USE,
 			if(a.IS_FILE = 0,'有附件','无附件') FILES,
 			if(a.IS_FILE = 0,'已归档','未归档') IS_FILE,
-			a.CONTRACT_NO,
-			a.POST,
-			CASE WHEN a.WORKING_HOURS=1 THEN "标准工时"
-			WHEN a.WORKING_HOURS =2 THEN "综合工时"
-			WHEN a.WORKING_HOURS =3 THEN "不定时工时制"
-			ELSE a.WORKING_HOURS END as "WORKING_HOURS",
+			max(a.CONTRACT_NO) CONTRACT_NO,
+			max(a.POST) POST,
+			CASE WHEN max(a.WORKING_HOURS)=1 THEN "标准工时"
+			WHEN max(a.WORKING_HOURS) =2 THEN "综合工时"
+			WHEN max(a.WORKING_HOURS) =3 THEN "不定时工时制"
+			ELSE max(a.WORKING_HOURS) END as "WORKING_HOURS",
 			a.CREATE_NAME,
 			CASE WHEN a.type=0 THEN "派增-社保派单"
 			WHEN a.type =1 THEN "派增-无社保新签"

yifu-common/yifu-common-ekp/src/main/resources/ekpSalaryConfig.properties

-ekp.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
-#ekp.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
+#ekp.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
+ekp.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
 ekp.fdModelId=181d7633ff8bc797276d0d3a54e80ad6
 ekp.fdFlowId=182b40249c1bc940d7226b941c7a4183
 ekp.docStatus=20