提交

src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java

@@ -962,18 +962,18 @@ public class SocialSecurityFundController {
 //		cbry.setId(insuredto.getId());
 //		cbry.updateById();
     	
-    	int isUse = 1;//是否使用 0:否 1：是
-    	
-    	SbgjjAdminCbry ascb = SbgjjAdminCbry.builder().id(insuredto.getId()).build().selectById();
-    	
-    	if(ascb.getSbjlStatime().equals(insuredto.getJnmouth()) || ascb.getGjjjlStatime().equals(insuredto.getGjjJnmouth())) {
-    		isUse = 0;
-    	}
+//    	int isUse = 1;//是否使用 0:否 1：是
+//    	
+//    	SbgjjAdminCbry ascb = SbgjjAdminCbry.builder().id(insuredto.getId()).build().selectById();
+//    	
+//    	if(ascb.getSbjlStatime().equals(insuredto.getJnmouth()) || ascb.getGjjjlStatime().equals(insuredto.getGjjJnmouth())) {
+//    		isUse = 0;
+//    	}
     	
     	SbgjjAdminCbry cbrytwo = SbgjjAdminCbry.builder().build();
     	cbrytwo.setState(0);//状态 1：使用中；0：历史记录
     	cbrytwo.setId(insuredto.getId());
-    	cbrytwo.setIsUse(isUse);
+    	cbrytwo.setIsUse(0);
     	cbrytwo.updateById();
 		
     	
@@ -1051,6 +1051,11 @@ public class SocialSecurityFundController {
 					preval = formatDouble1(Double.valueOf(jishuxx)*gsh);
 				}
 				
+				SbgjjAssoDetailed.builder().build().delete(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, insuredto.getUsernum())
+						.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getJnmouth()).eq(SbgjjAssoDetailed::getCbfzmxId, sbjs.getId()).eq(SbgjjAssoDetailed::getCoverageName, sbjs.getXz())
+						.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()));
+				
+				
 				SbgjjAssoDetailed deta = SbgjjAssoDetailed.builder().build();
 				deta.setUserId(insuredto.getUsernum());
 				deta.setAttributionTime(insuredto.getJnmouth());//
@@ -1171,6 +1176,10 @@ public class SocialSecurityFundController {
 					preval = formatDouble1(Double.valueOf(jishuxx)*gsh);
 				}
 				
+				SbgjjAssoDetailed.builder().build().delete(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, insuredto.getUsernum())
+						.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getGjjJnmouth()).eq(SbgjjAssoDetailed::getCbfzmxId, gjjgs.getId()).eq(SbgjjAssoDetailed::getCoverageName, gjjgs.getXz())
+						.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()));
+				
 				SbgjjAssoDetailed deta = SbgjjAssoDetailed.builder().build();
 				deta.setUserId(insuredto.getUsernum());
 				deta.setAttributionTime(insuredto.getGjjJnmouth());//

src/main/resources/mapping/sbgjj/SbgjjAdminCbryMapper.xml

@@ -183,7 +183,7 @@
 			cbry.gjjjl_statime as gjjjlstatime,
 			cbry.gjjjljs as gjjjljs
 			from yggl_main_emp emp 
-	LEFT JOIN sbgjj_admin_cbry as cbry on cbry.user_num = emp.emp_num and cbry.state = 1
+	LEFT JOIN sbgjj_admin_cbry as cbry on cbry.user_num = emp.emp_num and cbry.state = 1 and cbry.qyid = #{orgcode}
 	LEFT JOIN (select m.name as post,um.name as dept,m.id as mid
 				 from zzgl_bmgw_m m 
 				 left join zzgl_bmgw_m um on um.id = m.up_id