Merge remote-tracking branch 'origin/branch20211210' into branch20211210

db/12月8日需求变更新增.sql

@@ -17,3 +17,40 @@ INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sor
 
 ALTER TABLE `pay_meeting_situation`
     ADD COLUMN `register_process` tinyint(2) NULL COMMENT '报名流程' AFTER `contract_id`;
+
+-- auto-generated definition
+create table tb_certificate_payment
+(
+    id                   varchar(36)                 not null comment '主键',
+    create_by            varchar(50)                 null comment '创建人',
+    create_time          datetime                    null comment '创建日期',
+    update_by            varchar(50)                 null comment '更新人',
+    update_time          datetime                    null comment '更新日期',
+    project_id           varchar(36) charset utf8mb4 null comment '项目id',
+    bill_number          varchar(32)                 null comment '缴费单号',
+    company_name         varchar(100)                null comment '单位全称',
+    payment_type         int                         null comment '缴费类型',
+    payment_amount       double(50, 2)               null comment '缴费金额',
+    payment_time         int                         null comment '缴费时长',
+    submission_time      datetime                    null comment '缴费时间',
+    check_time           datetime                    null comment '核对时间',
+    payment_status       int                         null comment '缴费状态',
+    payment_method       int                         null comment '缴费方式',
+    payment_record       varchar(100)                null comment '缴费记录',
+    member_id            varchar(32)                 null comment '会员id',
+    check_result         int                         null comment '审核结果',
+    check_mark           varchar(1000)               null comment '备注',
+    bind                 int(10)                     null comment '绑定vin证书',
+    amount_receivable    decimal(12, 2)              null comment '应收金额',
+    paid_amount          decimal(12, 2)              null comment '实收金额',
+    certificate_id       varchar(32)                 null comment '证书id',
+    pack                 tinyint(1)                  null comment '打包',
+    invoice_requirements tinyint(1)                  null comment '需要发票',
+    in_account           tinyint(1)                  null comment '到账',
+    make_invoice         tinyint(1)                  null comment '开票',
+    mail                 tinyint(1)                  null comment '邮寄',
+    charge_use           tinyint(1) default 3        null comment '来款用途（字典表）',
+    invoice_amount       decimal(12, 2)              null comment '开票金额'
+)
+    comment '标协会员证书缴费表' charset = utf8;
+

jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java

@@ -83,7 +83,9 @@ public class SendMessageServiceImpl implements SendMessageService {
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode())
-                    || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){
+                    || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())
+                    || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG20.getCode())
+                    || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG21.getCode())){
                 map.put("systemAddress",env.getProperty("message.systemUrl"));
                 map.put("wxName",env.getProperty("message.wxName"));
             }
@@ -327,8 +329,20 @@ public class SendMessageServiceImpl implements SendMessageService {
                         //中汽中心标准所-管理端-邮寄通知-14
                         sender = "8821092414406";
                         signature = "中汽中心标准所";
+                        templateId = "c90ee6f41349451c959285a01ebaaf73";
+                        break;
+                    case "GL_15_XMTZ_UPLOAD_VOUCHER":
+                        //中汽中心标准所-管理端-项目通知-15
+                        sender = "8821092414406";
+                        signature = "中汽中心标准所";
                         templateId = "6f054af3cfc345168e1e2e3cbf03403b";
                         break;
+                    case "GL_16_HTTZ_HT_CANCELLATION":
+                        //中汽中心标准所-管理端-合同通知-16
+                        sender = "8821092414406";
+                        signature = "中汽中心标准所";
+                        templateId = "5c8f7a24fe1d4611b296fd942bea88a1";
+                        break;
                     case "QY_1_HYTZ_WORK_GROUP_CREATE":
                         //中汽中心标准所-企业端-会议通知-1
                         sender = "8821092414406";
@@ -429,6 +443,36 @@ public class SendMessageServiceImpl implements SendMessageService {
                         signature = "中汽中心标准所";
                         templateId =  "54d0f666c03f4de7ac9d9ac87fa60f4c";
                         break;
+                    case "QY_17_JFTZ_UPLOAD_VOUCHER":
+                        //中汽中心标准所-企业端-缴费通知-17
+                        sender = "8821092414406";
+                        signature = "中汽中心标准所";
+                        templateId =  "b84b4c425dae4d39b0ae14cd1fbe83c6";
+                        break;
+                    case "QY_18_JFTZ_VOUCHER_CHECK":
+                        //中汽中心标准所-企业端-缴费通知-18
+                        sender = "8821092414406";
+                        signature = "中汽中心标准所";
+                        templateId =  "365c477feb2f4e7b96a0344984627994";
+                        break;
+                    case "QY_19_HYTZ_CANCELLATION":
+                        //	中汽中心标准所-企业端-合同通知-19
+                        sender = "8821092414406";
+                        signature = "中汽中心标准所";
+                        templateId =  "572fb0a9da684bf6a47a530e5be467e0";
+                        break;
+                    case "QY_20_HYTZ_NOT_AUDIT_CREATE":
+                        //	中汽中心标准所-企业端-项目通知-20
+                        sender = "8821092414406";
+                        signature = "中汽中心标准所";
+                        templateId =  "fc2838a86f794d1891a3d4ce1ff9139e";
+                        break;
+                    case "QY_21_HYTZ_NOT_AUDIT_CREATE":
+                        //	中汽中心标准所-企业端-合同通知-21
+                        sender = "8821092414406";
+                        signature = "中汽中心标准所";
+                        templateId =  "c6608053b3a2482bb3db7c00820bbd4a";
+                        break;
                     default:
                         throw new JeroBootException("codeType flase.");
                 }

jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java

@@ -22,9 +22,13 @@ public class PayContactsManagementCommon {
      */
     public final static String FLAG_STATUS = "1";
     /**
-     * 删除状态(0为未通过，1为审核通过)只有企业端登录需要判断此字段
+     * 删除状态 0:通过 1：未通过只有企业端登录需要判断此字段
      */
-    public final static String DEL_FLAG = "0";
+    public final static String DEL_FLAG0 = "0";
+    /**
+     * 删除状态 0:通过 1：未通过只有企业端登录需要判断此字段
+     */
+    public final static String DEL_FLAG1 = "1";
 
 
 

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java

@@ -221,6 +221,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 			log.error("手机号、邮箱加密异常！",e);
 		}
 		payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE1);
+		payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1);
 		payContactsManagementService.save(payContactsManagement);
 		return Result.OK("添加成功！",payContactsManagement);
 	}

jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java

@@ -446,7 +446,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
                 throw new JeroBootException("此用户已在其他企业下");
             }
             addMeeting(payCompanyManagement);
-            payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG);
+            payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1);
             payContactsManagement.setCompanyId(payCompanyManagement.getId());
             payContactsManagementService.addMeeting(payContactsManagement);
         }else{// 编辑
@@ -473,7 +473,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
                     payContactsManagementService.contactsEdit(payContactsManagement);
                 }
             }else{
-                payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG);
+                payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1);
                 payContactsManagementService.addMeeting(payContactsManagement);
             }
             payCompanyManagement.setId(listPayCompanyManagement.get(0).getId());

jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java

@@ -106,6 +106,8 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
         }
         if(StringUtils.isBlank(payContactsManagement.getFlagStatus())){
             payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE1);
+        }else{
+            payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1);
         }
         save(payContactsManagement);
     }

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java

@@ -476,20 +476,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 		 PayIncomeContractDetailOutput payIncomeContractDetailOutput = JSONObject.parseObject(str,PayIncomeContractDetailOutput.class);
 		 List<ProjectOutput> listProject = new ArrayList<>();
 		 // 获取关联项目id
-		 if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){
+		 if(!Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){
-		 	 LambdaQueryWrapper<PayIncomeContractAssociatedCancellation> queryPayIncomeContractAssociatedCancellation = new LambdaQueryWrapper();
-			 queryPayIncomeContractAssociatedCancellation.eq(PayIncomeContractAssociatedCancellation::getContractId,payIncomeContract.getId());
-			 List<PayIncomeContractAssociatedCancellation> listPayIncomeContractAssociatedCancellation = payIncomeContractAssociatedCancellationService.list(queryPayIncomeContractAssociatedCancellation);
-		 	 if(!CollectionUtils.isEmpty(listPayIncomeContractAssociatedCancellation)){
-				 List<ProjectOutput> finalListProject = listProject;
-				 listPayIncomeContractAssociatedCancellation.forEach(p->{
-				 	String s = JSON.toJSONString(p);
-					 ProjectOutput projectOutput = JSONObject.parseObject(s,ProjectOutput.class);
-					 projectOutput.setId(p.getAssociatedId());
-					 finalListProject.add(projectOutput);
-				 });
-			 }
-		 }else{
 			 listProject = payIncomeContractService.getAssociated(id);
 		 }
 

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml

@@ -8,7 +8,7 @@
             SELECT
             pic.id,
             pic.contract_num AS contractNum,
-            pic.contract_name AS contractName,
+            if(pic.status = 6,CONCAT(pic.contract_name,'（已作废）'),pic.contract_name) AS contractName,
             pic.signed_company_id AS signedCompanyId,
             pic.signed_company_temporary_id AS signedCompanyTemporaryId,
             pic.signed_company_temporary_name AS signedCompanyTemporaryName,

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -1030,27 +1030,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                 payIncomeContractAssociatedCancellation.setId(null);
                 payIncomeContractAssociatedCancellation.setAssociatedId(p.getId());
                 list.add(payIncomeContractAssociatedCancellation);
-                if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE1)){
+                PayIncomeContractAssociated payIncomeContractAssociated = new PayIncomeContractAssociated();
-                    LambdaUpdateWrapper<PayCommonProject> updatePayCommonProject = new LambdaUpdateWrapper<>();
+                payIncomeContractAssociated.setId(p.getId());
-                    updatePayCommonProject.eq(PayCommonProject::getId,p.getProjectId());
+                cancelAssociated(payIncomeContractAssociated);
-                    updatePayCommonProject.set(PayCommonProject::getContractNum,null);
-                    payCommonProjectService.update(updatePayCommonProject);
-                }else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE2)){
-                    LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
-                    updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,p.getProjectId());
-                    updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,null);
-                    payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
-                }else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE3)){
-                    LambdaUpdateWrapper<PayMeetingSituation> updatePayMeetingSituation = new LambdaUpdateWrapper<>();
-                    updatePayMeetingSituation.eq(PayMeetingSituation::getId,p.getProjectId());
-                    updatePayMeetingSituation.set(PayMeetingSituation::getContractId,null);
-                    payMeetingSituationService.update(updatePayMeetingSituation);
-                }else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE4)){
-                    LambdaUpdateWrapper<PayMemberProjectSubitem> updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>();
-                    updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getId,p.getProjectId());
-                    updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getContractNo,null);
-                    memberProjectSubitemService.update(updatePayMemberProjectSubitem);
-                }
             });
             payIncomeContractAssociatedCancellationService.saveBatch(list);
         }

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

@@ -3,14 +3,17 @@ package com.jero.data.controller;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
@@ -23,7 +26,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.mail.commont.constant;
+import com.jero.meeting.entity.PayMeetingRemindRecord;
+import com.jero.meeting.service.IPayMeetingRemindRecordService;
 import com.jero.modules.system.util.SecurityUtil;
+import com.jero.project.common.PayProjectCommon;
 import com.jero.util.AmountUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -51,6 +57,8 @@ import io.swagger.annotations.ApiOperation;
 public class PayCaseCouncilSubitemController extends JeroController<PayCaseCouncilSubitem, IPayCaseCouncilSubitemService> {
 	@Autowired
 	private IPayCaseCouncilSubitemService payCaseCouncilSubitemService;
+	 @Resource
+	 private IPayMeetingRemindRecordService payMeetingRemindRecordService;
 
 	 /**
 	  * 理事会成员表
@@ -188,23 +196,45 @@ public class PayCaseCouncilSubitemController extends JeroController<PayCaseCounc
 		this.payCaseCouncilSubitemService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-//
+
-//	/**
+	 /**
-//	 * 通过id查询
+	  * 理事会成员表
-//	 *
+	  */
-//	 * @param id
+	 @DictPoint
-//	 * @return
+	 @ApiOperation(value="理事会成员表-列表查询", notes="理事会成员表-列表查询")
-//	 */
+	 @GetMapping(value = "/list")
-//	@AutoLog(value = "理事会成员-通过id查询")
+	 public Result<?> queryPageList(@RequestParam(name="id",required = true) String id,
-//	@ApiOperation(value="理事会成员-通过id查询", notes="理事会成员-通过id查询")
+									@RequestParam(name="companyName",required = false) String companyName,
-//	@GetMapping(value = "/queryById")
+									@RequestParam(name="meetingId",required = false) String meetingId) {
-//	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		 QueryWrapper<subCouncil> queryWrapper = Wrappers.query();
-//		PayCaseCouncilSubitem payCaseCouncilSubitem = payCaseCouncilSubitemService.getById(id);
+		 queryWrapper.eq("pm.council_id", id);
-//		if(payCaseCouncilSubitem==null) {
+		 if (StringUtils.isNotBlank(companyName)){
-//			return Result.error("未找到对应数据");
+			 queryWrapper.like("pm.company_name",companyName);
-//		}
+		 }
-//		return Result.OK(payCaseCouncilSubitem);
+		 List<subCouncil> list = payCaseCouncilSubitemService.listTwo(queryWrapper);
-//	}
+		 if (!CollectionUtils.isEmpty(list)) {
+			 try {
+				 list.forEach(p -> {
+					 if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) {
+						 p.setPhone(PasswordUtil.decrypt(p.getPhone()));
+					 }
+					 if (StringUtils.isNotBlank(meetingId)){
+						 LambdaQueryWrapper<PayMeetingRemindRecord> wrapper = new LambdaQueryWrapper<>();
+						 wrapper.eq(PayMeetingRemindRecord::getSubitemId,p.getId());
+						 int count = payMeetingRemindRecordService.count(wrapper);
+						 if (count>0){
+							 p.setRemind(PayProjectCommon.YES);
+						 }else {
+							 p.setRemind(PayProjectCommon.NO);
+						 }
+					 }
+				 });
+			 } catch (Exception e) {
+				 log.error("手机号、邮箱解密异常！", e);
+			 }
+		 }
+		 return Result.OK(list);
+	 }
 
 
 	 /**

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java

@@ -1,5 +1,6 @@
 package com.jero.data.entity;
 
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,6 +24,10 @@ public class subCouncil implements Serializable {
     @ApiModelProperty(value = "职位")
     private String post;
 
+    @ApiModelProperty(value = "是否已提醒")
+    @Dict(dicCode = "yn")
+    private Integer remind;
+
     public subCouncil(String id, String companyName, String peopleName, String phone, String post) {
         this.id = id;
         this.companyName = companyName;

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

@@ -1,12 +1,11 @@
 package com.jero.data.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.data.entity.ChooseExcelCouncil;
+import com.jero.data.entity.*;
-import com.jero.data.entity.FindByName;
-import com.jero.data.entity.PayCaseCouncilSubitem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jero.data.entity.councilList;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.ArrayList;
@@ -27,4 +26,7 @@ public interface PayCaseCouncilSubitemMapper extends BaseMapper<PayCaseCouncilSu
     List<ChooseExcelCouncil> listForExcel(@Param("contactsNames")String contactsNames, @Param("companyNames")String companyNames,@Param("councilNames") String councilNames);
 
     IPage<councilList> listThreeTwo(Page<councilList> page, @Param("id")String id,@Param("councilNames") String councilNames);
+
+    List<subCouncil> listTwo(@Param(Constants.WRAPPER) QueryWrapper<subCouncil> queryWrapper);
+
 }

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

@@ -133,4 +133,13 @@
         left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
          where  pm.council_id = #{pid}  order by pm.create_time desc
     </select>
+
+    <select id="listTwo"  resultType="com.jero.data.entity.subCouncil">
+       SELECT pm.id as id, pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as phone
+       from
+        pay_case_council pe
+        left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
+        left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
+         ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -1,12 +1,10 @@
 package com.jero.data.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.data.entity.ChooseExcelCouncil;
+import com.jero.data.entity.*;
-import com.jero.data.entity.FindByName;
-import com.jero.data.entity.PayCaseCouncilSubitem;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jero.data.entity.councilList;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,4 +25,6 @@ public interface IPayCaseCouncilSubitemService extends IService<PayCaseCouncilSu
 
     IPage<councilList> listThreeTwo(Page<councilList> page, String id, String councilNames);
 
+    List<subCouncil> listTwo(QueryWrapper<subCouncil> queryWrapper);
+
 }

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

@@ -1,11 +1,9 @@
 package com.jero.data.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jero.data.entity.ChooseExcelCouncil;
+import com.jero.data.entity.*;
-import com.jero.data.entity.FindByName;
-import com.jero.data.entity.PayCaseCouncilSubitem;
-import com.jero.data.entity.councilList;
 import com.jero.data.mapper.PayCaseCouncilSubitemMapper;
 import com.jero.data.service.IPayCaseCouncilSubitemService;
 import org.springframework.stereotype.Service;
@@ -47,5 +45,10 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl<PayCaseCouncil
         return payCaseCouncilSubitemMapper.listThreeTwo(page,id,councilNames);
     }
 
+    @Override
+    public List<subCouncil> listTwo(QueryWrapper<subCouncil> queryWrapper) {
+        return payCaseCouncilSubitemMapper.listTwo(queryWrapper);
+    }
+
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java

@@ -0,0 +1,171 @@
+package com.jero.member.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.jero.common.api.vo.Result;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.member.entity.TbCertificatePayment;
+import com.jero.member.service.ITbCertificatePaymentService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.jero.common.system.base.controller.JeroController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.jero.common.aspect.annotation.AutoLog;
+
+
+ /**
+ * @Description: 证书缴费表
+ * @Author: jero-boot
+ * @Date:   2021-12-14
+ * @Version: V1.0
+ */
+@Api(tags="证书缴费表")
+@RestController
+@RequestMapping("/member/tbCertificatePayment")
+@Slf4j
+public class TbCertificatePaymentController extends JeroController<TbCertificatePayment, ITbCertificatePaymentService> {
+	@Autowired
+	private ITbCertificatePaymentService tbCertificatePaymentService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tbCertificatePayment
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "证书缴费表-分页列表查询")
+	@ApiOperation(value="证书缴费表-分页列表查询", notes="证书缴费表-分页列表查询")
+	@GetMapping(value = "/page")
+	public Result<?> queryPageList(TbCertificatePayment tbCertificatePayment,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TbCertificatePayment> queryWrapper = QueryGenerator.initQueryWrapper(tbCertificatePayment, req.getParameterMap());
+		Page<TbCertificatePayment> page = new Page<TbCertificatePayment>(pageNo, pageSize);
+		IPage<TbCertificatePayment> pageList = tbCertificatePaymentService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "证书缴费表-列表查询")
+    @ApiOperation(value="证书缴费表-列表查询", notes="证书缴费表-列表查询")
+	@GetMapping(value = "/list")
+	public Result<List<TbCertificatePayment>> queryList() {
+        List<TbCertificatePayment> list = tbCertificatePaymentService.queryList();
+        return Result.OK(list);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param tbCertificatePayment
+	 * @return
+	 */
+	@AutoLog(value = "证书缴费表-添加")
+	@ApiOperation(value="证书缴费表-添加", notes="证书缴费表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@Validated @RequestBody TbCertificatePayment tbCertificatePayment) {
+		tbCertificatePaymentService.add(tbCertificatePayment);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param tbCertificatePayment
+	 * @return
+	 */
+	@AutoLog(value = "证书缴费表-编辑")
+	@ApiOperation(value="证书缴费表-编辑", notes="证书缴费表-编辑")
+	@PutMapping(value = "/edit")
+	public Result<?> edit(@Validated @RequestBody TbCertificatePayment tbCertificatePayment) {
+		tbCertificatePaymentService.editById(tbCertificatePayment);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "证书缴费表-通过id删除")
+	@ApiOperation(value="证书缴费表-通过id删除", notes="证书缴费表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		tbCertificatePaymentService.deleteById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "证书缴费表-批量删除")
+	@ApiOperation(value="证书缴费表-批量删除", notes="证书缴费表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.tbCertificatePaymentService.deleteByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "证书缴费表-通过id查询")
+	@ApiOperation(value="证书缴费表-通过id查询", notes="证书缴费表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.queryById(id);
+		if(tbCertificatePayment==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tbCertificatePayment);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tbCertificatePayment
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TbCertificatePayment tbCertificatePayment) {
+        return super.exportXls(request, tbCertificatePayment, TbCertificatePayment.class, "证书缴费表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TbCertificatePayment.class);
+    }
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java

@@ -0,0 +1,230 @@
+package com.jero.member.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 证书缴费表
+ * @Author: jero-boot
+ * @Date:   2021-12-14
+ * @Version: V1.0
+ */
+@Data
+@TableName("tb_certificate_payment")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tb_certificate_payment对象", description="证书缴费表")
+public class TbCertificatePayment implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+	/**创建人*/
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+	/**更新人*/
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+    /**项目id*/
+    @Excel(name = "项目名称", width = 15 ,dictTable = "tb_member_project", dicText = "project_name", dicCode = "id")
+    @ApiModelProperty(value = "项目id")
+    private String projectId;
+
+	/**缴费单号*/
+	@Excel(name = "缴费单号", width = 15)
+
+    @ApiModelProperty(value = "缴费单号")
+    private String billNumber;
+
+	/**单位全称*/
+	@Excel(name = "单位全称", width = 15)
+
+    @ApiModelProperty(value = "单位全称")
+    private String companyName;
+
+	/**缴费类型*/
+	@Excel(name = "缴费类型", width = 15)
+
+    @ApiModelProperty(value = "缴费类型")
+    private Integer paymentType;
+
+	/**缴费金额*/
+	@Excel(name = "缴费金额", width = 15)
+
+    @ApiModelProperty(value = "缴费金额")
+    private Double paymentAmount;
+
+	/**缴费时长*/
+	@Excel(name = "缴费时长", width = 15)
+
+    @ApiModelProperty(value = "缴费时长")
+    private Integer paymentTime;
+
+	/**缴费时间*/
+	@Excel(name = "缴费时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+
+    @ApiModelProperty(value = "缴费时间")
+    private java.util.Date submissionTime;
+
+	/**核对时间*/
+	@Excel(name = "核对时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+
+    @ApiModelProperty(value = "核对时间")
+    private java.util.Date checkTime;
+
+	/**缴费状态*/
+	@Excel(name = "缴费状态", width = 15)
+
+    @ApiModelProperty(value = "缴费状态")
+    private Integer paymentStatus;
+
+	/**缴费记录*/
+	@Excel(name = "缴费记录", width = 15)
+
+    @ApiModelProperty(value = "缴费记录")
+    private String paymentRecord;
+
+	/**会员id*/
+	@Excel(name = "会员id", width = 15)
+
+    @ApiModelProperty(value = "会员id")
+    private String memberId;
+
+	/**审核结果*/
+	@Excel(name = "审核结果", width = 15)
+
+    @ApiModelProperty(value = "审核结果")
+    private Integer checkResult;
+
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+
+    @ApiModelProperty(value = "备注")
+    private String checkMark;
+
+	/**绑定vin证书*/
+	@Excel(name = "绑定vin证书", width = 15)
+
+    @ApiModelProperty(value = "绑定vin证书")
+    private Integer bind;
+
+	/**证书id*/
+	@Excel(name = "证书id", width = 15)
+
+    @ApiModelProperty(value = "证书id")
+    private String certificateId;
+
+    /**
+     * 应收金额
+     */
+    @Excel(name = "应收金额", width = 15)
+    @ApiModelProperty(value = "应收金额")
+    @NotNull(message = "应收金额不能为空")
+    @DecimalMax(value = "9999999999.99", message = "应收金额格式错误")
+    private BigDecimal amountReceivable;
+
+    /**
+     * 实收金额
+     */
+    @Excel(name = "实收金额", width = 15)
+    @ApiModelProperty(value = "实收金额")
+    @DecimalMax(value = "9999999999.99", message = "实收金额格式错误")
+    private BigDecimal paidAmount;
+
+    /**打包*/
+    @Excel(name = "打包", width = 15,dicCode = "yn")
+    @ApiModelProperty(value = "打包")
+    private Integer pack;
+
+    /**需要发票*/
+    @Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
+    @ApiModelProperty(value = "需要发票")
+    private Integer invoiceRequirements;
+
+    /**到账*/
+    @Excel(name = "到账", width = 15,dicCode = "account_type")
+    @ApiModelProperty(value = "到账")
+    private Integer inAccount;
+
+    /**开票*/
+    @Excel(name = "开票", width = 15,dicCode = "make_invoice_type")
+    @ApiModelProperty(value = "开票")
+    private Integer makeInvoice;
+
+    /**邮寄*/
+    @Excel(name = "邮寄", width = 15,dicCode = "mail_type")
+    @ApiModelProperty(value = "邮寄")
+    private Integer mail;
+
+    /**来款用途（字典表）*/
+    @ApiModelProperty(value = "来款用途（字典表）")
+    private String chargeUse;
+
+    /**缴费方式*/
+    @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
+    @Dict(dicCode = "meeting_pay_type")
+    private Integer paymentMethod;
+
+    /**开票金额*/
+    @Excel(name = "开票金额", width = 15)
+    @ApiModelProperty(value = "开票金额")
+    @DecimalMax(value = "9999999999.99",message = "开票金额格式错误")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal invoiceAmount;
+
+    /**项目名称*/
+    @ApiModelProperty(value = "项目名称")
+    @TableField(exist = false)
+    private String projectName;
+
+    /**
+     * 项目类型
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目类型")
+    private Integer projectType;
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbCertificatePaymentMapper.java

@@ -0,0 +1,17 @@
+package com.jero.member.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.jero.member.entity.TbCertificatePayment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 证书缴费表
+ * @Author: jero-boot
+ * @Date:   2021-12-14
+ * @Version: V1.0
+ */
+public interface TbCertificatePaymentMapper extends BaseMapper<TbCertificatePayment> {
+
+}

jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbCertificatePaymentMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.member.mapper.TbCertificatePaymentMapper">
+    <resultMap id="TbCertificatePaymentResultMap" type="com.jero.member.entity.TbCertificatePayment">
+        <id column="id" property="id" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="bill_number" property="billNumber" />
+        <result column="company_name" property="companyName" />
+        <result column="payment_type" property="paymentType" />
+        <result column="payment_amount" property="paymentAmount" />
+        <result column="payment_time" property="paymentTime" />
+        <result column="submission_time" property="submissionTime" />
+        <result column="check_time" property="checkTime" />
+        <result column="payment_status" property="paymentStatus" />
+        <result column="payment_method" property="paymentMethod" />
+        <result column="payment_record" property="paymentRecord" />
+        <result column="member_id" property="memberId" />
+        <result column="check_result" property="checkResult" />
+        <result column="check_mark" property="checkMark" />
+        <result column="bind" property="bind" />
+        <result column="certificate_id" property="certificateId" />
+    </resultMap>
+</mapper>

jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbCertificatePaymentService.java

@@ -0,0 +1,44 @@
+package com.jero.member.service;
+
+import com.jero.member.entity.TbCertificatePayment;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 证书缴费表
+ * @Author: jero-boot
+ * @Date:   2021-12-14
+ * @Version: V1.0
+ */
+public interface ITbCertificatePaymentService extends IService<TbCertificatePayment> {
+
+	/**
+	 * 保存
+	 */
+    void add(TbCertificatePayment tbCertificatePayment);
+
+	/**
+	 * 更新
+	 */
+    void editById(TbCertificatePayment tbCertificatePayment);
+
+	/**
+	 * 通过id删除
+	 */
+    void deleteById(String id);
+
+	/**
+	 * 批量删除
+	 */
+    void deleteByIds(List<String> ids);
+
+	/**
+	 * 通过id查询
+	 */
+    TbCertificatePayment queryById(String id);
+
+    /**
+	 * 列表查询
+	 */
+    List<TbCertificatePayment> queryList();
+}

jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbCertificatePaymentServiceImpl.java

@@ -0,0 +1,84 @@
+package com.jero.member.service.impl;
+
+import com.jero.member.entity.TbCertificatePayment;
+import com.jero.member.mapper.TbCertificatePaymentMapper;
+import com.jero.member.service.ITbCertificatePaymentService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 证书缴费表
+ * @Author: jero-boot
+ * @Date:   2021-12-14
+ * @Version: V1.0
+ */
+@Service
+public class TbCertificatePaymentServiceImpl extends ServiceImpl<TbCertificatePaymentMapper, TbCertificatePayment> implements ITbCertificatePaymentService {
+
+	/**
+	 * 保存
+	 *
+	 * @param tbCertificatePayment
+	 * @return
+	 */
+	@Override
+    public void add(TbCertificatePayment tbCertificatePayment) {
+        save(tbCertificatePayment);
+    }
+
+	/**
+	 * 更新
+	 *
+	 * @param tbCertificatePayment
+	 * @return
+	 */
+	@Override
+    public void editById(TbCertificatePayment tbCertificatePayment) {
+    	saveOrUpdate(tbCertificatePayment);
+    }
+
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public void deleteById(String id) {
+        removeById(id);
+    }
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+    public void deleteByIds(List<String> ids) {
+        removeByIds(ids);
+    }
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+    public TbCertificatePayment queryById(String id) {
+        return getById(id);
+    }
+
+    /**
+	 * 列表查询
+	 *
+	 * @return
+	 */
+	@Override
+    public List<TbCertificatePayment> queryList() {
+        return list();
+    }
+}

jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java

@@ -93,13 +93,17 @@ public class PayProjectCommon {
     public static final Integer YES = 1;
 
     /**
-     * 项目类型1:工作组，2：分标委
+     * 项目类型1:工作组，2：分标委, 3:理事会
      */
     public final static Integer PROJECT_TYPE_FILE1 = 1;
     /**
-     * 项目类型1:工作组，2：分标委
+     * 项目类型1:工作组，2：分标委, 3:理事会
      */
     public final static Integer PROJECT_TYPE_FILE2 = 2;
+    /**
+     * 项目类型1:工作组，2：分标委, 3:理事会
+     */
+    public final static Integer PROJECT_TYPE_FILE3 =3;
     /**
      * 需要发票（1：增值税普通发票，2：增值税专用发票，0：否，3：需要发票（小程序需要））
      */

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

@@ -197,6 +197,7 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
 	 * @param id
 	 * @return
 	 */
+	@Transactional
 	@AutoLog(value = "在研项目-通过id删除")
 	@ApiOperation(value="在研项目-通过id删除", notes="在研项目-通过id删除")
 	@GetMapping(value = "/delete")

jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupDataFile.java

@@ -41,7 +41,7 @@ public class PayWorkingGroupDataFile implements Serializable {
     @Size(max = 32,message = "项目id长度不能大于32个字符")
     private java.lang.String projectId;
     /**项目类型1:工作组，2：分标委*/
-    @ApiModelProperty(value = "项目类型1:工作组，2：分标委")
+    @ApiModelProperty(value = "项目类型1:工作组，2：分标委,3:理事会")
     @NotEmpty(message = "项目类型1不能为空")
     private java.lang.Integer projectType;
 	/**文件id*/