Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!502

src/main/java/cn/timer/api/bean/sbgjj/SbgjjAssoDetailed.java

@@ -51,9 +51,15 @@ public class SbgjjAssoDetailed extends Model<SbgjjAssoDetailed> {
 
 	@ApiModelProperty(value = "个人金额 ", example = "个人金额")
 	private Double personalAmount;
+	
+	@ApiModelProperty(value = "个人比例 ", example = "个人比例")
+	private String personalProportion;
 
 	@ApiModelProperty(value = "公司金额 ", example = "公司金额")
 	private Double companyAmount;
+	
+	@ApiModelProperty(value = "公司比例 ", example = "公司比例")
+	private String companyProportion;
 
 	@ApiModelProperty(value = "险种类型 1：社保；2：公积金", example = "101")
 	private Integer xzType;
@@ -63,5 +69,15 @@ public class SbgjjAssoDetailed extends Model<SbgjjAssoDetailed> {
 
 	@ApiModelProperty(value = "生成时间 生成时间", example = "101")
 	private Long addtime;
+	
+	
+	@ApiModelProperty(value = "参保方案 ", example = "参保方案")
+	private String cbfns;
+	
+	@ApiModelProperty(value = "社保基数 ", example = "社保基数")
+	private String sbjss;
+
+	@ApiModelProperty(value = "公积金基数 ", example = "公积金基数")
+	private String gjjjss;
 
 }
\ No newline at end of file

src/main/java/cn/timer/api/controller/LoginController.java

@@ -41,6 +41,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.timer.api.aspect.lang.annotation.Log;
 import cn.timer.api.aspect.lang.enums.BusinessType;
 import cn.timer.api.bean.jxgl.JxglBasicSetting;
+import cn.timer.api.bean.kqmk.KqglAssoBcsz;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveEmployeeBalance;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRulesT;
@@ -544,7 +545,23 @@ public class LoginController {
 	private KqglAssoLeaveRulesMapper kqglassoleaverulesmapper;
 	@Autowired
 	private KqglAssoOvertimeRulesMMapper kqglassoovertimerulesmmapper;
-
+	
+	
+	@GetMapping(value="/doublecheck/{checkobject}")
+	@ApiOperation(value = "检查注册公司名是否重复", httpMethod = "GET", notes = "接口发布说明")
+	public Result<Object> doublecheck(@PathVariable("checkobject") String checkobject) {
+		
+		QyzxEntInfoM gsif = QyzxEntInfoM.builder().build().selectOne(new QueryWrapper<QyzxEntInfoM>().lambda().eq(QyzxEntInfoM::getName, checkobject));
+		
+		if(gsif != null) {
+			return ResultUtil.success("呀，该公司名已被注册了！！！") ;
+		}else {
+			return ResultUtil.data(0,"操作成功!");
+		}
+		
+	}
+	
+	
 	/**
 	 * 注册企业
 	 * 

src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java

@@ -2029,7 +2029,7 @@ public class TimeCardController {
 			double gzsc = 0;
 			
 			long rest_time = 0;
-			if(dkbc.getStartTime() != null && dkbc.getEndTime() != null) {
+			if(dkbc.getStartTime() != null && !("").equals(dkbc.getStartTime()) && dkbc.getEndTime() != null && !("").equals(dkbc.getEndTime())) {
 				long kaishixiuxi = Long.valueOf(ClockInTool.dateToStamp(punchattdate + " " +dkbc.getStartTime()+":00"));
 			    long jieshuxiuxi = Long.valueOf(ClockInTool.dateToStamp(punchattdate + " " +dkbc.getEndTime()+":00"));
 			    rest_time = (jieshuxiuxi - kaishixiuxi)/1000/60;//休息时间

src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java

@@ -22,6 +22,7 @@ import cn.timer.api.bean.kqgl.PunchCardDetails;
 import cn.timer.api.bean.kqgl.PunchRecord;
 import cn.timer.api.bean.kqgl.Schedule;
 import cn.timer.api.bean.kqmk.KqglAssoBcsz;
+import cn.timer.api.bean.kqmk.KqglAssoDkmx;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary;
 import cn.timer.api.bean.kqmk.KqglAssoOvertimeBasics;
@@ -97,7 +98,7 @@ public class AttendanceTaskTiming{
 	//typeid:1-员工  2-考勤组
 
 //	@Scheduled(cron = "0 */5 * * * ?")
-//	@Scheduled(cron = "0 44 17 * * ?")
+//	@Scheduled(cron = "0 52 15 * * ?")
 	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
 	public void AttendanceTask() throws ParseException {
 
@@ -130,9 +131,9 @@ public class AttendanceTaskTiming{
 			int summaryid = 0;//汇总id
 			
 			
-			List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>());//系统中的所有公司  所有未到期的公司
+//			List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>());//系统中的所有公司  所有未到期的公司
 			
-//			List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>().lambda().eq(QyzxEntInfoM::getId, 1));
+			List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>().lambda().eq(QyzxEntInfoM::getId, 1));
 			
 			for(int t = 0;t<orgcodelist.size();t++){
 				int org_code = orgcodelist.get(t).getId();//企业组织代码
@@ -565,7 +566,24 @@ public class AttendanceTaskTiming{
 										}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(sblacks), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(ztts), num)) {
 											rowData.add("上班缺卡,下班早退");
 										}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(cdts), num)) {
-											rowData.add("上班迟到");
+//											rowData.add("上班迟到");
+											KqglAssoDkmx dkm = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, user.getEmpnum())
+													.eq(KqglAssoDkmx::getQyid, org_code).eq(KqglAssoDkmx::getData, num));
+											if(dkm.getYdkcs() == 2 || dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+												if(dkm.getSbdk1jg() > 0) {
+													rowData.add("上班1迟到，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getSbdk1()))+"，迟到"+dkm.getSbdk1jg()+"分钟");
+												}
+											} 
+											if(dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+												if(dkm.getSbdk2jg() > 0) {
+													rowData.add("上班2迟到，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getSbdk2()))+"，迟到"+dkm.getSbdk2jg()+"分钟");
+												}
+											}
+											if(dkm.getYdkcs() == 6) {
+												if(dkm.getSbdk3jg() > 0) {
+													rowData.add("上班3迟到，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getSbdk3()))+"，迟到"+dkm.getSbdk3jg()+"分钟");
+												}
+											}
 										}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(cdts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xblacks), num)) {
 											rowData.add("上班迟到,下班缺卡");
 										}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(cdts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(ztts), num)) {
@@ -574,7 +592,24 @@ public class AttendanceTaskTiming{
 										}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xblacks),num)) {
 											rowData.add("下班缺卡");
 										}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(ztts), num)) {
-											rowData.add("下班早退");
+//											rowData.add("下班早退");
+											KqglAssoDkmx dkm = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, user.getEmpnum())
+													.eq(KqglAssoDkmx::getQyid, org_code).eq(KqglAssoDkmx::getData, num));
+											if(dkm.getYdkcs() == 2 || dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+												if(dkm.getXbdk1jg() > 0) {
+													rowData.add("下班1早退，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getXbdk1()))+"，早退"+dkm.getXbdk1jg()+"分钟");
+												}
+											}
+											if(dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+												if(dkm.getXbdk2jg() > 0) {
+													rowData.add("下班2早退，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getXbdk2()))+"，早退"+dkm.getXbdk2jg()+"分钟");
+												}
+											}
+											if(dkm.getYdkcs() == 6) {
+												if(dkm.getXbdk3jg() > 0) {
+													rowData.add("下班3早退，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getXbdk3()))+"，早退"+dkm.getXbdk3jg()+"分钟");
+												}
+											}
 										}else {
 											rowData.add("正常");
 										}

src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java

@@ -22,6 +22,7 @@ import cn.timer.api.bean.kqgl.PunchCardDetails;
 import cn.timer.api.bean.kqgl.PunchRecord;
 import cn.timer.api.bean.kqgl.Schedule;
 import cn.timer.api.bean.kqmk.KqglAssoBcsz;
+import cn.timer.api.bean.kqmk.KqglAssoDkmx;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary;
 import cn.timer.api.bean.kqmk.KqglAssoOvertimeBasics;
@@ -546,7 +547,24 @@ public class LastMonthtimingExport {
 									}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(sblacks), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(ztts), num)) {
 										rowData.add("上班缺卡,下班早退");
 									}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(cdts), num)) {
-										rowData.add("上班迟到");
+//										rowData.add("上班迟到");
+										KqglAssoDkmx dkm = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, user.getEmpnum())
+												.eq(KqglAssoDkmx::getQyid, org_code).eq(KqglAssoDkmx::getData, num));
+										if(dkm.getYdkcs() == 2 || dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+											if(dkm.getSbdk1jg() > 0) {
+												rowData.add("上班1迟到，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getSbdk1()))+"，迟到"+dkm.getSbdk1jg()+"分钟");
+											}
+										} 
+										if(dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+											if(dkm.getSbdk2jg() > 0) {
+												rowData.add("上班2迟到，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getSbdk2()))+"，迟到"+dkm.getSbdk2jg()+"分钟");
+											}
+										}
+										if(dkm.getYdkcs() == 6) {
+											if(dkm.getSbdk3jg() > 0) {
+												rowData.add("上班3迟到，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getSbdk3()))+"，迟到"+dkm.getSbdk3jg()+"分钟");
+											}
+										}
 									}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(cdts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xblacks), num)) {
 										rowData.add("上班迟到,下班缺卡");
 									}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(cdts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(ztts), num)) {
@@ -555,7 +573,24 @@ public class LastMonthtimingExport {
 									}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xblacks),num)) {
 										rowData.add("下班缺卡");
 									}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(ztts), num)) {
-										rowData.add("下班早退");
+//										rowData.add("下班早退");
+										KqglAssoDkmx dkm = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, user.getEmpnum())
+												.eq(KqglAssoDkmx::getQyid, org_code).eq(KqglAssoDkmx::getData, num));
+										if(dkm.getYdkcs() == 2 || dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+											if(dkm.getXbdk1jg() > 0) {
+												rowData.add("下班1早退，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getXbdk1()))+"，早退"+dkm.getXbdk1jg()+"分钟");
+											}
+										}
+										if(dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+											if(dkm.getXbdk2jg() > 0) {
+												rowData.add("下班2早退，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getXbdk2()))+"，早退"+dkm.getXbdk2jg()+"分钟");
+											}
+										}
+										if(dkm.getYdkcs() == 6) {
+											if(dkm.getXbdk3jg() > 0) {
+												rowData.add("下班3早退，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getXbdk3()))+"，早退"+dkm.getXbdk3jg()+"分钟");
+											}
+										}
 									}else {
 										rowData.add("正常");
 									}

src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java

@@ -21,6 +21,7 @@ import cn.timer.api.bean.kqgl.PunchCardDetails;
 import cn.timer.api.bean.kqgl.PunchRecord;
 import cn.timer.api.bean.kqgl.Schedule;
 import cn.timer.api.bean.kqmk.KqglAssoBcsz;
+import cn.timer.api.bean.kqmk.KqglAssoDkmx;
 import cn.timer.api.bean.kqmk.KqglAssoLeaveRules;
 import cn.timer.api.bean.kqmk.KqglAssoMonthPunchSummary;
 import cn.timer.api.bean.kqmk.KqglAssoOvertimeBasics;
@@ -542,7 +543,24 @@ public class RealTimeUpdate{
 								}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(sblacks), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(ztts), num)) {
 									rowData.add("上班缺卡,下班早退");
 								}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(cdts), num)) {
-									rowData.add("上班迟到");
+//									rowData.add("上班迟到");
+									KqglAssoDkmx dkm = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, user.getEmpnum())
+											.eq(KqglAssoDkmx::getQyid, org_code).eq(KqglAssoDkmx::getData, num));
+									if(dkm.getYdkcs() == 2 || dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+										if(dkm.getSbdk1jg() > 0) {
+											rowData.add("上班1迟到，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getSbdk1()))+"，迟到"+dkm.getSbdk1jg()+"分钟");
+										}
+									} 
+									if(dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+										if(dkm.getSbdk2jg() > 0) {
+											rowData.add("上班2迟到，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getSbdk2()))+"，迟到"+dkm.getSbdk2jg()+"分钟");
+										}
+									}
+									if(dkm.getYdkcs() == 6) {
+										if(dkm.getSbdk3jg() > 0) {
+											rowData.add("上班3迟到，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getSbdk3()))+"，迟到"+dkm.getSbdk3jg()+"分钟");
+										}
+									}
 								}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(cdts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xblacks), num)) {
 									rowData.add("上班迟到,下班缺卡");
 								}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(cdts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(ztts), num)) {
@@ -551,7 +569,24 @@ public class RealTimeUpdate{
 								}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xblacks),num)) {
 									rowData.add("下班缺卡");
 								}else if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(ztts), num)) {
-									rowData.add("下班早退");
+//									rowData.add("下班早退");
+									KqglAssoDkmx dkm = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, user.getEmpnum())
+											.eq(KqglAssoDkmx::getQyid, org_code).eq(KqglAssoDkmx::getData, num));
+									if(dkm.getYdkcs() == 2 || dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+										if(dkm.getXbdk1jg() > 0) {
+											rowData.add("下班1早退，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getXbdk1()))+"，早退"+dkm.getXbdk1jg()+"分钟");
+										}
+									}
+									if(dkm.getYdkcs() == 4 || dkm.getYdkcs() == 6) {
+										if(dkm.getXbdk2jg() > 0) {
+											rowData.add("下班2早退，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getXbdk2()))+"，早退"+dkm.getXbdk2jg()+"分钟");
+										}
+									}
+									if(dkm.getYdkcs() == 6) {
+										if(dkm.getXbdk3jg() > 0) {
+											rowData.add("下班3早退，打卡时间："+ClockInTool.stampToDate3(String.valueOf(dkm.getXbdk3()))+"，早退"+dkm.getXbdk3jg()+"分钟");
+										}
+									}
 								}else {
 									rowData.add("正常");
 								}

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

@@ -581,7 +581,7 @@ public class SocialSecurityFundController {
 							if(Double.valueOf(sbjs.getJsxx()) > Double.valueOf(insuredto.getJnjs())) {
 								jishuxx = Double.valueOf(sbjs.getJsxx());//基数下限
 							}else {
-								jishuxx = Double.valueOf(insuredto.getJnjs());//基数下限
+								jishuxx = Double.valueOf(insuredto.getJnjs());//用户填写的社保基数
 							}
 					        BigDecimal gsbili = new BigDecimal(sbjs.getGjbl());//公司比例
 							BigDecimal bfb = new BigDecimal(100);
@@ -595,11 +595,21 @@ public class SocialSecurityFundController {
 						
 						deta.setCbfzmxId(sbjs.getId());
 						deta.setCoverageName(sbjs.getXz());
+						
 						deta.setPersonalAmount(0.0);
+						deta.setPersonalProportion("");//个人比例
 						deta.setCompanyAmount(preval);//公司金额
+						deta.setCompanyProportion(sbjs.getGjbl());
+						
 						deta.setXzType(1);//险种类型 1：社保；2：公积金
 						deta.setOrgCode(userBean.getOrgCode());
 						deta.setAddtime(new Date().getTime());
+						
+						SbgjjAssoCbfa sbgjjfa = SbgjjAssoCbfa.builder().id(sbjs.getCbfaid()).build().selectById();
+						deta.setCbfns(sbgjjfa.getCbmcName());//参保方案
+						deta.setSbjss(insuredto.getJnjs());//社保基数
+						deta.setGjjjss(insuredto.getGjjJnjs());//公积金基数
+						
 						detalis.add(deta);
 						
 						Logoutput("公司-社保："+preval);
@@ -635,7 +645,7 @@ public class SocialSecurityFundController {
 								.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getJnmouth()).eq(SbgjjAssoDetailed::getCbfzmxId, sbjsgr.getId()).eq(SbgjjAssoDetailed::getCoverageName, sbjsgr.getXz())
 								.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()));
 						if(dtd != null) {
-							SbgjjAssoDetailed.builder().id(dtd.getId()).personalAmount(preval).build().updateById();
+							SbgjjAssoDetailed.builder().id(dtd.getId()).personalAmount(preval).personalProportion(sbjsgr.getGrbl()).build().updateById();
 						}
 						
 						
@@ -702,14 +712,23 @@ public class SocialSecurityFundController {
 						
 						SbgjjAssoDetailed deta = SbgjjAssoDetailed.builder().build();
 						deta.setUserId(Integer.valueOf(usernums[f]));
-						deta.setAttributionTime(insuredto.getJnmouth());//
+						deta.setAttributionTime(insuredto.getGjjJnmouth());//
 						deta.setCbfzmxId(gjjgs.getId());
 						deta.setCoverageName(gjjgs.getXz());
+						
 						deta.setPersonalAmount(0.0);
+						deta.setPersonalProportion("");
 						deta.setCompanyAmount(preval);//公司金额
+						deta.setCompanyProportion(gjjgs.getGjbl());//公司比例
 						deta.setXzType(2);//险种类型 1：社保；2：公积金
 						deta.setOrgCode(userBean.getOrgCode());
 						deta.setAddtime(new Date().getTime());
+						
+						SbgjjAssoCbfa sbgjjfa = SbgjjAssoCbfa.builder().id(gjjgs.getCbfaid()).build().selectById();
+						deta.setCbfns(sbgjjfa.getCbmcName());//参保方案
+						deta.setSbjss(insuredto.getJnjs());//社保基数
+						deta.setGjjjss(insuredto.getGjjJnjs());//公积金基数
+						
 						deta.insert();
 						
 						Logoutput("公司-公积金："+preval);
@@ -737,10 +756,10 @@ public class SocialSecurityFundController {
 						}
 						
 						SbgjjAssoDetailed dtd = sbgjjassodetailedmapper.selectOne(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, Integer.valueOf(usernums[f]))
-								.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getJnmouth()).eq(SbgjjAssoDetailed::getCbfzmxId, gjjgr.getId()).eq(SbgjjAssoDetailed::getCoverageName, gjjgr.getXz())
+								.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getGjjJnmouth()).eq(SbgjjAssoDetailed::getCbfzmxId, gjjgr.getId()).eq(SbgjjAssoDetailed::getCoverageName, gjjgr.getXz())
 								.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()));
 						if(dtd!=null) {
-							SbgjjAssoDetailed.builder().id(dtd.getId()).personalAmount(preval).build().updateById();
+							SbgjjAssoDetailed.builder().id(dtd.getId()).personalAmount(preval).personalProportion(gjjgr.getGrbl()).build().updateById();
 						}
 						
 						Logoutput("个人-公积金："+preval);
@@ -880,37 +899,84 @@ public class SocialSecurityFundController {
     @PutMapping(value = "/adjustment")
 	@ApiOperation(value = "调整", httpMethod = "PUT", notes = "接口发布说明")
 	public ResponseResult adjustment(@CurrentUser UserBean userBean,@RequestBody InsureDto insuredto) {
-		SbgjjAdminCbry cbry = SbgjjAdminCbry.builder().build();
+    	
+//		SbgjjAdminCbry cbry = SbgjjAdminCbry.builder().build();
+//		cbry.setUserNum(insuredto.getUsernum()); 
+//		if(insuredto.getSb()) {
+//			//cbry.setSbcbState(2);//社保参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
+////			cbry.setSbjlStatime(null);//社保缴纳起始月
+////			cbry.setSbjljs(null);//社保缴纳基数
+//		}else {
+//			cbry.setSbcbState(1);//社保参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
+//			cbry.setSbjlStatime(insuredto.getJnmouth());//社保缴纳起始月
+//			cbry.setSbjljs(Double.valueOf(insuredto.getJnjs()));//社保缴纳基数
+//		}
+//		if(insuredto.getGjj()) {
+//			//cbry.setGjjcbState(2);//公积金参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
+////			cbry.setGjjjlStatime(null);//公积金缴纳起始月
+////			cbry.setGjjjljs(null);//公积金缴纳基数
+//		}else {
+//			cbry.setGjjcbState(1);//公积金参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
+//			cbry.setGjjjlStatime(insuredto.getGjjJnmouth());//公积金缴纳起始月
+//			cbry.setGjjjljs(Double.valueOf(insuredto.getGjjJnjs()));//公积金缴纳基数
+//		}
+//		cbry.setCbfacs(insuredto.getInsuredcities());//参保城市
+//		
+//		cbry.setState(1);//状态 1：使用中；0：历史记录
+//		cbry.setQyid(userBean.getOrgCode());
+//		
+//		cbry.setSbfaid(insuredto.getSbfaid());
+//		cbry.setGjjfaid(insuredto.getGjjfaid());
+//		
+//		cbry.setId(insuredto.getId());
+//		cbry.updateById();
+    	
+    	SbgjjAdminCbry cbrytwo = SbgjjAdminCbry.builder().build();
+    	cbrytwo.setState(0);//状态 1：使用中；0：历史记录
+    	cbrytwo.setId(insuredto.getId());
+    	cbrytwo.updateById();
+		
+    	SbgjjAdminCbry cbry = SbgjjAdminCbry.builder().build();
 		cbry.setUserNum(insuredto.getUsernum()); 
 		if(insuredto.getSb()) {
-			//cbry.setSbcbState(2);//社保参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
-//			cbry.setSbjlStatime(null);//社保缴纳起始月
-//			cbry.setSbjljs(null);//社保缴纳基数
+			cbry.setSbcbState(2);//社保参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
+			cbry.setSbjlStatime(null);//社保缴纳起始月
+			cbry.setSbjljs(null);//社保缴纳基数
 		}else {
 			cbry.setSbcbState(1);//社保参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
 			cbry.setSbjlStatime(insuredto.getJnmouth());//社保缴纳起始月
 			cbry.setSbjljs(Double.valueOf(insuredto.getJnjs()));//社保缴纳基数
 		}
 		if(insuredto.getGjj()) {
-			//cbry.setGjjcbState(2);//公积金参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
-//			cbry.setGjjjlStatime(null);//公积金缴纳起始月
-//			cbry.setGjjjljs(null);//公积金缴纳基数
+			cbry.setGjjcbState(2);//公积金参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
+			cbry.setGjjjlStatime(null);//公积金缴纳起始月
+			cbry.setGjjjljs(null);//公积金缴纳基数
 		}else {
 			cbry.setGjjcbState(1);//公积金参保状态 0：未投保 1：正常在缴 2：暂不办理 3：已停保
 			cbry.setGjjjlStatime(insuredto.getGjjJnmouth());//公积金缴纳起始月
 			cbry.setGjjjljs(Double.valueOf(insuredto.getGjjJnjs()));//公积金缴纳基数
 		}
+		cbry.setJlMode(1);//缴纳方式 1：公司自缴
 		cbry.setCbfacs(insuredto.getInsuredcities());//参保城市
 		
+		cbry.setSbjlEndtime(null);//社保缴纳结束月
+		cbry.setGjjjlEndtime(null);//公积金缴纳结束月
+		cbry.setInsureNum(userBean.getEmpNum());//投保人员
+		cbry.setInsureTime(new Date().getTime());//投保时间
+//		cbry.setStopNum();//停保人员
+//		cbry.setStopTime();//停保时间
 		cbry.setState(1);//状态 1：使用中；0：历史记录
 		cbry.setQyid(userBean.getOrgCode());
 		
 		cbry.setSbfaid(insuredto.getSbfaid());
 		cbry.setGjjfaid(insuredto.getGjjfaid());
 		
-		cbry.setId(insuredto.getId());
-		cbry.updateById();
+		sbgjjadmincbrymapper.insertsbgjjadmincbry(cbry);
+		
+		
+		insuredto.setId(cbry.getId());
 		
+		List<SbgjjAssoDetailed> detalis = new ArrayList<SbgjjAssoDetailed>();
 		
 		//*************************************社保******************************************************
 		double gssocial = 0;//公司社保总
@@ -921,6 +987,9 @@ public class SocialSecurityFundController {
 		//社保******
 			//公司
 			
+			SbgjjAssoDetailed.builder().build().delete(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, insuredto.getUsernum()).eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode())
+					.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getJnmouth()));
+			
 			for(SbgjjAssoCbfzmx sbjs:shebaolist) {
 				double jishuxx = 0;
 				double preval = 0;
@@ -937,10 +1006,38 @@ public class SocialSecurityFundController {
 					double gsh = gsbili.divide(bfb).doubleValue();
 					preval = formatDouble1(Double.valueOf(jishuxx)*gsh);
 				}
+				
+				SbgjjAssoDetailed deta = SbgjjAssoDetailed.builder().build();
+				deta.setUserId(insuredto.getUsernum());
+				deta.setAttributionTime(insuredto.getJnmouth());//
+				
+				deta.setCbfzmxId(sbjs.getId());
+				deta.setCoverageName(sbjs.getXz());
+				
+				deta.setPersonalAmount(0.0);
+				deta.setPersonalProportion("");
+				deta.setCompanyAmount(preval);//公司金额
+				deta.setCompanyProportion(sbjs.getGjbl());
+				
+				deta.setXzType(1);//险种类型 1：社保；2：公积金
+				deta.setOrgCode(userBean.getOrgCode());
+				deta.setAddtime(new Date().getTime());
+				
+				SbgjjAssoCbfa sbgjjfa = SbgjjAssoCbfa.builder().id(sbjs.getCbfaid()).build().selectById();
+				deta.setCbfns(sbgjjfa.getCbmcName());//参保方案
+				deta.setSbjss(insuredto.getJnjs());//社保基数
+				deta.setGjjjss(insuredto.getGjjJnjs());//公积金基数
+				
+				detalis.add(deta);
+				
 				gssocial += preval;
 			}
 			Logoutput("公司社保总："+formatDouble1(gssocial));
 			
+			if(detalis.size()>0){
+				sbgjjassodetailedmapper.insertsbgjjassodetailedList(detalis);
+			}
+			
 			//个人
 			
 			for(SbgjjAssoCbfzmx sbjsgr:shebaolist) {
@@ -959,6 +1056,14 @@ public class SocialSecurityFundController {
 					double gsh = gsbigr.divide(bfgr).doubleValue();
 					preval = formatDouble1(Double.valueOf(jishuxxgr)*gsh);
 				}
+				
+				SbgjjAssoDetailed dtd = sbgjjassodetailedmapper.selectOne(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, insuredto.getUsernum())
+						.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getJnmouth()).eq(SbgjjAssoDetailed::getCbfzmxId, sbjsgr.getId()).eq(SbgjjAssoDetailed::getCoverageName, sbjsgr.getXz())
+						.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()));
+				if(dtd != null) {
+					SbgjjAssoDetailed.builder().id(dtd.getId()).personalAmount(preval).personalProportion(sbjsgr.getGrbl()).build().updateById();
+				}
+				
 				grsocial += preval;
 		        
 			}
@@ -966,7 +1071,7 @@ public class SocialSecurityFundController {
 			
 			String gjjgshj_ = "0.0";
 			String gjjgrhj_ = "0.0";
-			String gjjhj_ = "0.0";
+			String gjjhj_ = "0.0"; 
 			if(!(insuredto.getJnmouth()).equals(insuredto.getGjjJnmouth())) {
 				
 				sbgjjassoyjzdmapper.deletesbgjjassoyjzd(insuredto.getUsernum(),userBean.getOrgCode(),insuredto.getJnmouth(),insuredto.getId());
@@ -1021,6 +1126,29 @@ public class SocialSecurityFundController {
 					double gsh = gsbili.divide(bfb).doubleValue();
 					preval = formatDouble1(Double.valueOf(jishuxx)*gsh);
 				}
+				
+				SbgjjAssoDetailed deta = SbgjjAssoDetailed.builder().build();
+				deta.setUserId(insuredto.getUsernum());
+				deta.setAttributionTime(insuredto.getGjjJnmouth());//
+				deta.setCbfzmxId(gjjgs.getId());
+				deta.setCoverageName(gjjgs.getXz());
+				
+				deta.setPersonalAmount(0.0);
+				deta.setPersonalProportion("");
+				deta.setCompanyAmount(preval);//公司金额
+				deta.setCompanyProportion(gjjgs.getGjbl());
+				
+				deta.setXzType(2);//险种类型 1：社保；2：公积金
+				deta.setOrgCode(userBean.getOrgCode());
+				deta.setAddtime(new Date().getTime());
+				
+				SbgjjAssoCbfa sbgjjfa = SbgjjAssoCbfa.builder().id(gjjgs.getCbfaid()).build().selectById();
+				deta.setCbfns(sbgjjfa.getCbmcName());//参保方案
+				deta.setSbjss(insuredto.getJnjs());//社保基数
+				deta.setGjjjss(insuredto.getGjjJnjs());//公积金基数
+				
+				deta.insert();
+				
 				gsfund += preval;
 			}
 			Logoutput("公司公积金总："+formatDouble1(gsfund));
@@ -1043,6 +1171,14 @@ public class SocialSecurityFundController {
 					double gsh = gsbigr.divide(bfgr).doubleValue();
 					preval = formatDouble1(Double.valueOf(jishuxxgr)*gsh);
 				}
+				
+				SbgjjAssoDetailed dtd = sbgjjassodetailedmapper.selectOne(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, insuredto.getUsernum())
+						.eq(SbgjjAssoDetailed::getAttributionTime, insuredto.getGjjJnmouth()).eq(SbgjjAssoDetailed::getCbfzmxId, gjjgr.getId()).eq(SbgjjAssoDetailed::getCoverageName, gjjgr.getXz())
+						.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()));
+				if(dtd!=null) {
+					SbgjjAssoDetailed.builder().id(dtd.getId()).personalAmount(preval).personalProportion(gjjgr.getGrbl()).build().updateById();
+				}
+				
 				grgsfund += preval;
 			}
 			Logoutput("个人公积金总："+formatDouble1(grgsfund));
@@ -1170,6 +1306,32 @@ public class SocialSecurityFundController {
 		return new ResponseResult().success("成功", yjzlist);
 	}
     
+    /**
+	 *	月结账明细
+	 */
+    @PostMapping(value = "/mochshe_detailedSB")
+	@ApiOperation(value = "月结账单信息", httpMethod = "POST", notes = "接口发布说明")
+	public ResponseResult mochshedetailedSB(@CurrentUser UserBean userBean,@RequestBody MonthlyStatementDto monthly) {
+		
+		List<SbgjjAssoDetailed> yjzdmxlist = SbgjjAssoDetailed.builder().build().selectList(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, monthly.getUsernum())
+				.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()).eq(SbgjjAssoDetailed::getAttributionTime, monthly.getMon()).eq(SbgjjAssoDetailed::getXzType, 1));
+		
+		return new ResponseResult().success("成功", yjzdmxlist);
+	}
+    
+    /**
+	 *	月结账明细
+	 */
+    @PostMapping(value = "/mochshe_detailedGJJ")
+	@ApiOperation(value = "月结账单信息", httpMethod = "POST", notes = "接口发布说明")
+	public ResponseResult mochshedetailedGJJ(@CurrentUser UserBean userBean,@RequestBody MonthlyStatementDto monthly) {
+		
+		List<SbgjjAssoDetailed> yjzdmxlist = SbgjjAssoDetailed.builder().build().selectList(new QueryWrapper<SbgjjAssoDetailed>().lambda().eq(SbgjjAssoDetailed::getUserId, monthly.getUsernum())
+				.eq(SbgjjAssoDetailed::getOrgCode, userBean.getOrgCode()).eq(SbgjjAssoDetailed::getAttributionTime, monthly.getMon()).eq(SbgjjAssoDetailed::getXzType, 2));
+		
+		return new ResponseResult().success("成功", yjzdmxlist);
+	}
+    
     @Value("${config-8timer.environmental-science}")
 	public String environmental_science;
 	

src/main/java/cn/timer/api/dto/sbgjj/MonthlyCheckoutSheetDto.java

@@ -16,6 +16,11 @@ public class MonthlyCheckoutSheetDto implements Serializable {
 	private static final long serialVersionUID = 4192763674865997955L;
 	String empname;
 	int usernum;
+	
+	String dept;
+	String post;
+	String rztime;
+	
 	String totalmoney;
 	String gsjltotal;
 	String grjltotal;

src/main/java/cn/timer/api/dto/sbgjj/MonthlyStatementDto.java

@@ -16,4 +16,5 @@ public class MonthlyStatementDto implements Serializable {/**
 	int orgcode;
 	String title;
 	String mon;
+	int usernum;
 }

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

@@ -122,6 +122,13 @@
                 gjjfaid
     </sql>
     
+    <sql id="salary_List">
+    	id,org_code,emp_num,age,appopenid,area,birthday,blood_type,bmgw_id,province_id,province,district_id,district,city_id,
+		city,edu,english_name,head_url,hk_address,hk_type,is_jrkq,is_married,is_pregnant,jg_id,jg,job_status,job_type,language,
+		address,mpopenid,mz,name,openid,job_num,password,phone,qq,rz_time,sex,sfzyx_time,sjzz_time,syq,unionid,wechat,work_address,work_email,
+		work_phone,zj_num,zj_type,zpqd,zy,zz_remark,zz_time,zzmm,update_man,update_time,is_manager,before_leaving_sts,bmgw_name,custom_num
+    </sql>
+    
     <sql id="Base_Column_List_Alias">
                 id SbgjjAdminCbry_id,
                 user_num SbgjjAdminCbry_user_num,
@@ -146,12 +153,13 @@
     </sql>
 
 
-<select id="EmployeeListByorgCode" resultMap="YgglEmpInfoMap">
-     select * from yggl_main_emp
-		    where org_code = #{orgCode,jdbcType=VARCHAR}
-		    and job_status = 1
-		and emp_num not in (select cbry.user_num from sbgjj_admin_cbry cbry where cbry.qyid = #{orgCode,jdbcType=VARCHAR})
-  </select>
+	 <select id="EmployeeListByorgCode" resultMap="YgglEmpInfoMap">
+	     select <include refid="salary_List" /> 
+	     	from yggl_main_emp
+			    where org_code = #{orgCode,jdbcType=VARCHAR}
+			    and job_status != 3
+			and emp_num not in (select cbry.user_num from sbgjj_admin_cbry cbry where cbry.qyid = #{orgCode,jdbcType=VARCHAR})
+	  </select>
 
 
 <select id="InsuredPersonnel" resultMap="InsuredPersonnelMap">

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

@@ -10,40 +10,21 @@
                 <result column="cbfzmx_id" property="cbfzmxId" />
                 <result column="coverage_name" property="coverageName" />
                 <result column="personal_amount" property="personalAmount" />
+                <result column="personal_proportion" property="personalProportion" />
+                
                 <result column="company_amount" property="companyAmount" />
+                <result column="company_proportion" property="companyProportion" />
                 <result column="xz_type" property="xzType" />
                 <result column="org_code" property="orgCode" />
                 <result column="addtime" property="addtime" />
+                
+                <result column="cbfns" property="cbfns" />
+                <result column="sbjss" property="sbjss" />
+                <result column="gjjjss" property="gjjjss" />
     </resultMap>
 
-    <sql id="Base_Column_List">
-                id,
-                user_id,
-                attribution_time,
-                cbfzmx_id,
-                coverage_name,
-                personal_amount,
-                company_amount,
-                xz_type,
-                org_code,
-                addtime
-    </sql>
-    
-    <sql id="Base_Column_List_Alias">
-                id SbgjjAssoDetailed_id,
-                user_id SbgjjAssoDetailed_user_id,
-                attribution_time SbgjjAssoDetailed_attribution_time,
-                cbfzmx_id SbgjjAssoDetailed_cbfzmx_id,
-                coverage_name SbgjjAssoDetailed_coverage_name,
-                personal_amount SbgjjAssoDetailed_personal_amount,
-                company_amount SbgjjAssoDetailed_company_amount,
-                xz_type SbgjjAssoDetailed_xz_type,
-                org_code SbgjjAssoDetailed_org_code,
-                addtime SbgjjAssoDetailed_addtime
-    </sql>
-
 	<insert id="insertsbgjjassodetailedList" parameterType="java.util.List" >
-	    insert into sbgjj_asso_detailed (user_id,attribution_time,cbfzmx_id,coverage_name,personal_amount,company_amount,xz_type,org_code,addtime)
+	    insert into sbgjj_asso_detailed (user_id,attribution_time,cbfzmx_id,coverage_name,personal_amount,personal_proportion,company_amount,company_proportion,xz_type,org_code,addtime,cbfns,sbjss,gjjjss)
 	    <foreach collection="list" item="item" index="index" open="values " close="" separator=",">
 	   	(
 	      <if test="item.userId != null" >
@@ -61,9 +42,15 @@
 	      <if test="item.personalAmount != null" >
 	        #{item.personalAmount},
 	      </if>
+	      <if test="item.personalProportion != null" >
+	        #{item.personalProportion},
+	      </if>
 	      <if test="item.companyAmount != null" >
 	        #{item.companyAmount},
 	      </if>
+	      <if test="item.companyProportion != null" >
+	        #{item.companyProportion},
+	      </if>
 	      <if test="item.xzType != null" >
 	        #{item.xzType},
 	      </if>
@@ -71,115 +58,20 @@
 	        #{item.orgCode},
 	      </if>
 	      <if test="item.addtime != null" >
-	        #{item.addtime}
+	        #{item.addtime},
+	      </if>
+	      <if test="item.cbfns != null" >
+	        #{item.cbfns},
+	      </if>
+	      <if test="item.sbjss != null" >
+	        #{item.sbjss},
+	      </if>
+	      <if test="item.gjjjss != null" >
+	        #{item.gjjjss}
 	      </if>
 	      )
 	    </foreach>
    </insert>
 
-	<!-- 
-
-    <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.sbgjj.SbgjjAssoDetailed">
-        INSERT INTO sbgjj_asso_detailed
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-                        <if test ='null != userId'>
-                        user_id,
-                        </if>
-                        <if test ='null != attributionTime'>
-                        attribution_time,
-                        </if>
-                        <if test ='null != cbfzmxId'>
-                        cbfzmx_id,
-                        </if>
-                        <if test ='null != coverageName'>
-                        coverage_name,
-                        </if>
-                        <if test ='null != personalAmount'>
-                        personal_amount,
-                        </if>
-                        <if test ='null != companyAmount'>
-                        company_amount,
-                        </if>
-                        <if test ='null != xzType'>
-                        xz_type,
-                        </if>
-                        <if test ='null != orgCode'>
-                        org_code,
-                        </if>
-                        <if test ='null != addtime'>
-                        addtime
-                        </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-                        <if test ='null != userId'>
-                        #{userId},
-                        </if>
-                        <if test ='null != attributionTime'>
-                        #{attributionTime},
-                        </if>
-                        <if test ='null != cbfzmxId'>
-                        #{cbfzmxId},
-                        </if>
-                        <if test ='null != coverageName'>
-                        #{coverageName},
-                        </if>
-                        <if test ='null != personalAmount'>
-                        #{personalAmount},
-                        </if>
-                        <if test ='null != companyAmount'>
-                        #{companyAmount},
-                        </if>
-                        <if test ='null != xzType'>
-                        #{xzType},
-                        </if>
-                        <if test ='null != orgCode'>
-                        #{orgCode},
-                        </if>
-                        <if test ='null != addtime'>
-                        #{addtime}
-                        </if>
-        </trim>
-    </insert>
-
-    <delete id="delete" >
-        DELETE FROM sbgjj_asso_detailed
-        WHERE id = #{id}
-    </delete>
-
-    <update id="update" parameterType="cn.timer.api.bean.sbgjj.SbgjjAssoDetailed">
-        UPDATE sbgjj_asso_detailed
-        <set>
-                    <if test ='null != userId'>user_id = #{userId},</if>
-                    <if test ='null != attributionTime'>attribution_time = #{attributionTime},</if>
-                    <if test ='null != cbfzmxId'>cbfzmx_id = #{cbfzmxId},</if>
-                    <if test ='null != coverageName'>coverage_name = #{coverageName},</if>
-                    <if test ='null != personalAmount'>personal_amount = #{personalAmount},</if>
-                    <if test ='null != companyAmount'>company_amount = #{companyAmount},</if>
-                    <if test ='null != xzType'>xz_type = #{xzType},</if>
-                    <if test ='null != orgCode'>org_code = #{orgCode},</if>
-                    <if test ='null != addtime'>addtime = #{addtime}</if>
-        </set>
-        WHERE id = #{id}
-    </update>
-
-
-    <select id="load" resultMap="BaseResultMap">
-        SELECT <include refid="Base_Column_List" />
-        FROM sbgjj_asso_detailed
-        WHERE id = #{id}
-    </select>
-
-    <select id="pageList" resultMap="BaseResultMap">
-        SELECT <include refid="Base_Column_List" />
-        FROM sbgjj_asso_detailed
-        LIMIT #{offset}, #{pageSize}
-    </select>
-
-    <select id="pageListCount" resultType="java.lang.Integer">
-        SELECT count(1)
-        FROM sbgjj_asso_detailed
-    </select>
-
-	 -->
 
 </mapper>
\ No newline at end of file

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

@@ -88,6 +88,9 @@
     <select id="MonthlycheckoutsheetList" resultMap="MonthlyCheckoutSheetMap">
     		select emp.`name` as empname, 
 			yjzd.user_num as usernum,
+			bmgw.dept,
+			bmgw.post,
+			emp.rz_time as rztime,
 			yjzd.totalmoney,
 			yjzd.gsjltotal,
 			yjzd.grjltotal,
@@ -105,14 +108,20 @@
 			yjzd.cbryid
 			from sbgjj_asso_yjzd yjzd
 		LEFT JOIN yggl_main_emp as emp on emp.emp_num = yjzd.user_num
+		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  
+		) as bmgw on bmgw.mid = emp.bmgw_id
 		where yjzd.cbryid in (select cbry.id from sbgjj_admin_cbry cbry
-		where cbry.state = 1
+		where 1=1
 		and cbry.qyid = #{orgcode})
 		and yjzd.zymonth = #{mon}
 		and emp.org_code = #{orgcode}
 		<if test="title != null" >
 	   		and (emp.`name` like CONCAT('%',#{title},'%') or emp.emp_num = #{title})
 	   	</if>
+	   	
+	   	<!-- cbry.state = 1  ==> 1=1 -->
     </select>
 
 	<select id="zcjsjginsurance" resultMap="BaseResultMap">