分标委bug处理

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java

@@ -151,20 +151,6 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
 		return Result.OK("删除成功!");
 	}
 
-	 /**
-	  * 导出excel
-	  *
-	  *
-	  */
-	 @AutoLog(value = "分标委表-导出")
-	 @ApiOperation(value="分标委表-导出", notes="分标委表-导出")
-	 @GetMapping(value = "/exportXls",produces = "text/text;charset=utf-8")
-	 public ModelAndView customExportXlsList() {
-		 QueryWrapper<PayCaseCommitteeExcel> queryWrapper = Wrappers.query();
-		 List<PayCaseCommitteeExcel> list = payCaseCommitteeSubitemService.listExcel(queryWrapper);
-		 return AmountUtil.exportListXls(list, AllProjectStatistics.class, "分标委表导出");
-	 }
-
 
 
 //	/**

jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java

@@ -66,25 +66,18 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 	@AutoLog(value = "分标委成员表-搜索")
 	@ApiOperation(value="分标委成员表-搜索", notes="分标委成员表-搜索",response = FindByName.class)
 	@GetMapping(value = "/find")
-	public Result<?> find(@RequestParam(name="name",required =false) String name,
+	public Result<?> find(@RequestParam(name="contactsName",required =false) String contactsName,
 						  @RequestParam(name="companyName",required =false) String companyName,
 						  @RequestParam(name="fenBiaoWeiName",required =false) String fenBiaoWeiName,
 						  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 						  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
 								   ) {
-		QueryWrapper<PayCaseCommittee> queryWrapper = Wrappers.query();
+
-		QueryWrapper<PayCaseCommittee> queryWrapper2 = Wrappers.query();
+		Page<FindByName> page = new Page<>(pageNo, pageSize);
-		HashMap<String, Object> objectObjectHashMap = new HashMap<>();
+		IPage<FindByName> pageList = payCaseCommitteeSubitemService.list3(page,contactsName,companyName,fenBiaoWeiName);
-		List<FindByName> pageList2 = payCaseCommitteeSubitemService.list4((pageNo-1)*pageSize,pageSize, name,companyName,fenBiaoWeiName,queryWrapper2);
+		if (!CollectionUtils.isEmpty(pageList.getRecords())) {
-		objectObjectHashMap.put("pages",pageList2.size()/pageSize);
-		objectObjectHashMap.put("total",pageList2.size());
-		objectObjectHashMap.put("courent",pageNo);
-		objectObjectHashMap.put("size",pageSize);
-		objectObjectHashMap.put("pages",(pageList2.size()/pageSize)+1);
-		List<FindByName> pageList = payCaseCommitteeSubitemService.list3((pageNo-1)*pageSize,pageSize, name,companyName,fenBiaoWeiName,queryWrapper);
-		if (!CollectionUtils.isEmpty(pageList)) {
 			try {
-				pageList.forEach(p -> {
+				pageList.getRecords().forEach(p -> {
 					if (!CollectionUtils.isEmpty(p.getList())) {
 						for (ChildrenFindByName q:p.getList()
 							 ) {
@@ -94,12 +87,12 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 						}
 					}
 				});
-				objectObjectHashMap.put("records",pageList);
+
 			} catch (Exception e) {
 				log.error("手机号、邮箱解密异常！", e);
 			}
 		}
-		return Result.OK(objectObjectHashMap);
+		return Result.OK(pageList);
 	}
 	/**
 	 * 列表查询
@@ -151,13 +144,13 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 	@AutoLog(value = "分标委表导出-导出")
 	@ApiOperation(value="分标委表导出-导出", notes="分标委表导出-导出")
 	@GetMapping(value = "/exportXls",produces = "text/text;charset=utf-8")
-	public ModelAndView customExportXlsList(@RequestParam(name="name",required =false) String name,
+	public ModelAndView customExportXlsList(@RequestParam(name="contactsName",required =false) String contactsName,
 											@RequestParam(name = "ids",required = false) String ids,
 											@RequestParam(name="companyName",required =false) String companyName,
 											@RequestParam(name="fenBiaoWeiName",required =false) String fenBiaoWeiName) {
 //		ids为空表示搜索导出
 		if (StringUtils.isBlank(ids)) {
-			List<ChooseExcelWorkingGroup> list = payCaseCommitteeSubitemService.listForExcel(name, companyName, fenBiaoWeiName);
+			List<ChooseExcelWorkingGroup> list = payCaseCommitteeSubitemService.listForExcel(contactsName, companyName, fenBiaoWeiName);
 			return getModelAndView(list);
 		} else {
 			ArrayList<String> idList = new ArrayList<>(Arrays.asList(ids.split(",")));
@@ -212,7 +205,15 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
 	public Result<?> add(@Valid @RequestBody PayCaseCommitteeSubitemDTO payCaseCommitteeSubitemDTO) {
 		PayCaseCommitteeSubitem payCaseCommitteeSubitem = new PayCaseCommitteeSubitem();
 		BeanUtils.copyProperties(payCaseCommitteeSubitemDTO,payCaseCommitteeSubitem);
-		payCaseCommitteeSubitemService.save(payCaseCommitteeSubitem);
+//		新增时校验重复
+		LambdaQueryWrapper<PayCaseCommitteeSubitem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PayCaseCommitteeSubitem::getContactsId, payCaseCommitteeSubitemDTO.getContactsId());
+		List<PayCaseCommitteeSubitem> list = payCaseCommitteeSubitemService.list(lambdaQueryWrapper);
+		if (list.size() > 0) {
+			return Result.error("联系人重复，请重新选择");
+		} else {
+			payCaseCommitteeSubitemService.save(payCaseCommitteeSubitem);
+		}
 		return Result.OK("添加成功！");
 	}
 

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java

@@ -23,7 +23,7 @@ import java.util.List;
  */
 public interface PayCaseCommitteeSubitemMapper extends BaseMapper<PayCaseCommitteeSubitem> {
 
-    List<FindByName> list3 (@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param(Constants.WRAPPER) Wrapper<PayCaseCommittee> wrapper);
+    IPage<FindByName> list3 (Page<FindByName> page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName);
 
     List<payCaseCommitteeSubitemVO> list2 (@Param(Constants.WRAPPER) Wrapper<PayCaseCommitteeSubitem> wrapper);
 

jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml

@@ -4,7 +4,7 @@
     <resultMap id="people" type="com.jero.data.entity.FindByName">
         <id property="id" column="id"></id>
         <result property="name" column="name"></result>
-        <collection property="list" ofType="com.jero.data.entity.ChildrenFindByName" javaType="java.util.List">
+        <collection property="list" ofType="com.jero.data.entity.ChildrenFindByName" javaType="java.util.List" select="listForChildren" column="{pid=id,companyName=companyName,tname=tname}" >
             <id property="childrenId" column="childrenId"></id>
             <result property="companyName" column="companyName"></result>
             <result property="post" column="post"></result>
@@ -13,8 +13,8 @@
         </collection>
     </resultMap>
     <select id="list3"  resultMap="people">
-       SELECT pe.id as id,pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name,pm.id as childrenId
+        SELECT pe.id as id,pe.name as name,#{companyName} as companyName,#{name} as tname
-       from
+        from
         pay_case_committee pe
         left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
         left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
@@ -29,9 +29,25 @@
                 AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
             </if>
         </where>
-         limit #{pageNo},#{pageSize}
+        order by pe.create_time desc
-
     </select>
+    <select id="listForChildren" resultType="com.jero.data.entity.ChildrenFindByName">
+        SELECT pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pm.id as childrenId
+        from
+       pay_case_committee_subitem pm
+        left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
+        <where>
+            pm.committee_id = #{pid}
+            <if test=" companyName!=null and companyName != ''">
+                AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
+            </if>
+            <if test=" tname!=null and tname != ''">
+                AND pt.name LIKE CONCAT('%',#{tname},'%')
+            </if>
+        </where>
+        order by pm.create_time desc
+    </select>
+
 
     <select id="listForExcel"  resultType="com.jero.data.entity.ChooseExcelWorkingGroup">
         SELECT pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pe.name as name

jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java

@@ -27,7 +27,7 @@ public interface IPayCaseCommitteeSubitemService extends IService<PayCaseCommitt
 
     List<payCaseCommitteeSubitemVO> list2(QueryWrapper<PayCaseCommitteeSubitem> queryWrapper);
 
-    List<FindByName> list3(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper);
+    IPage<FindByName> list3(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName);
 
     List<FindByName> list4(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper);
 

jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java

@@ -45,8 +45,8 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl<PayCaseCommi
     }
 
     @Override
-    public List<FindByName> list3(Integer pageNo,Integer pageSize,String name,String companyName,String fenBiaoWeiName, QueryWrapper<PayCaseCommittee> queryWrapper) {
+    public IPage<FindByName> list3(Page<FindByName> page,String name,String companyName,String fenBiaoWeiName) {
-        return payCaseCommitteeSubitemMapper.list3(pageNo,pageSize,name,companyName,fenBiaoWeiName, queryWrapper);
+        return payCaseCommitteeSubitemMapper.list3(page,name,companyName,fenBiaoWeiName);
     }
 
     @Override

jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml

@@ -55,7 +55,7 @@
 
     <select id="pageList" resultType="com.jero.mail.entity.PayMailBill">
        SELECT pmb.id,pmbp.project_id as projectId,project_name as projectName,bill_no AS billNo,pmb.invoice_amount as invoiceAmount,principal_name as principalName,charge_company_name as chargeCompanyName,
-contact_name as contactName,contact_mobile as contactMobile,post_status as postStatus,send_method as sendMethod ,create_time from  pay_mail_bill pmb left join pay_mail_bill_project pmbp
+contact_name as contactName,contact_mobile as contactMobile,post_status as postStatus,send_method as sendMethod ,create_time,post_no as postNo,send_date as sendDate,pmb.remark from  pay_mail_bill pmb left join pay_mail_bill_project pmbp
 on(pmb.id=pmbp.bill_id)
  ${ew.customSqlSegment}
 group by pmb.id ORDER BY post_status ASC,create_time DESC

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java

@@ -100,15 +100,7 @@ public class PayWorkingGroupStatisticsController {
                 payWorkingGroupStatistics.setComeAllMoney("0.00");
             }
         }
-//    //去除项目下来款金额为零的工作组
+
-//        ArrayList<PayWorkingGroupStatistics> list = new ArrayList<>();
-//        for(PayWorkingGroupStatistics payWorkingGroupStatistics:records) {
-//            if (ObjectUtils.isNotEmpty(payWorkingGroupStatistics)) {
-//                if (!("0".equals(payWorkingGroupStatistics.getComeAllMoney()) || payWorkingGroupStatistics.getComeAllMoney() == null)) {
-//                    list.add(payWorkingGroupStatistics);
-//                }
-//            }
-//        }
         //计算应收和实收总金额
         double sum=0;
         double sum2 =0;
@@ -124,7 +116,7 @@ public class PayWorkingGroupStatisticsController {
             if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
                 s.setComeAllMoney("0.00");
             }
-            if(s.getMoneyRate()== null || s.getComeAllMoney().equals("") ) {
+            if(s.getMoneyRate()== null || s.getMoneyRate().equals("") ) {
                 s.setMoneyRate("0.00%");
             }
         }
@@ -160,7 +152,7 @@ public class PayWorkingGroupStatisticsController {
             List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
             idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
             //所领导或者超级管理员
-        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
+        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
             idList=null;
             //企业职员项目负责人
         }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
@@ -168,9 +160,16 @@ public class PayWorkingGroupStatisticsController {
             idList.add(userId);
         }
         List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch,idList);
-        for (PayWorkingGroupStatistics payWorkingGroupStatistics:pageList){
+        //处理为空数据为0
-            if(payWorkingGroupStatistics.getComeAllMoney()==null||payWorkingGroupStatistics.getComeAllMoney()==""){
+        for(PayWorkingGroupStatistics s: pageList){
-                payWorkingGroupStatistics.setComeAllMoney("0.00");
+            if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
+                s.setAllMoney("0.00");
+            }
+            if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
+                s.setComeAllMoney("0.00");
+            }
+            if(s.getMoneyRate()== null || s.getMoneyRate().equals("") ) {
+                s.setMoneyRate("0.00%");
             }
         }
         return AmountUtil.exportListXls(pageList, PayWorkingGroupStatistics.class,"工作组项目统计");
@@ -246,7 +245,16 @@ for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
             payWorkingGroupSubletSearch.setYear(year);
         }
         List<PayWorkGroupSubletStatistics> pageList = payWorkingGroupSubItemService.importExcelStatistics(payWorkingGroupSubletSearch,id);
+        //处理为空数据为0
+        for(PayWorkGroupSubletStatistics s: pageList){
+            if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
+                s.setAllMoney("0.00");
+            }
+            if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
+                s.setComeAllMoney("0.00");
+            }
 
+        }
         return AmountUtil.exportListXls(pageList, PayWorkGroupSubletStatistics.class, "工作组成员统计");
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java

@@ -69,7 +69,7 @@ public class AllProjectStatisticsController {
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
         List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
-        if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
+        if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
             List<String> idList = null;
             if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
                 Calendar calendar = Calendar.getInstance();
@@ -137,7 +137,7 @@ public class AllProjectStatisticsController {
                 List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
                 idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
                 //所领导或者超级管理员
-            } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
+            } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
                 idList=null;
                 //企业职员项目负责人
             }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
@@ -184,15 +184,16 @@ public class AllProjectStatisticsController {
     }
 
     /**
-     *所领导统计
+     *所领导统计导出
      *
      */
     @GetMapping(value = "/statistics/excel")
-    @ApiOperation(value = "所领导统计-导出统计", notes = "所领导统计-导出统计")
+    @ApiOperation(value = "所领导统计导出-导出统计", notes = "所领导统计导出-导出统计")
     public ModelAndView excel( AllProjectStatisticsSearch allProjectStatisticsSearch) {
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysUser.getRoleCode();
-        if(constant.SLD.equals(roleCode)||constant.ADMIN.equals(roleCode)||constant.QYXXWHRY.equals(roleCode)) {
+        List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
+        if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
             if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
                 Calendar calendar = Calendar.getInstance();
                 String year = String.valueOf(calendar.get(Calendar.YEAR));
@@ -208,7 +209,6 @@ public class AllProjectStatisticsController {
                 }
             }
             return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计");
-
         }else {
             return  new ModelAndView();
         }

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java

@@ -140,7 +140,7 @@ public class CompanyComeMoneyStatisticsController {
             List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
             idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
             //所领导或者超级管理员
-        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
+        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
             idList=null;
             //企业职员项目负责人
         }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
@@ -204,7 +204,7 @@ public class CompanyComeMoneyStatisticsController {
             List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
             idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
             //所领导或者超级管理员
-        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
+        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
             idList=null;
             //企业职员项目负责人
         }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){

jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java

@@ -81,7 +81,7 @@ public class PrincipalPeopleStatisticsController {
             List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
             idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
             //所领导或者超级管理员
-        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
+        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
             idList=null;
             //企业职员项目负责人
         }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
@@ -211,7 +211,7 @@ public class PrincipalPeopleStatisticsController {
             List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
             idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
             //所领导或者超级管理员
-        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)||roleCodes.contains(constant.QYXXWHRY)) {
+        } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
             idList=null;
             //企业职员项目负责人
         }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){