打包管理添加证书

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

@@ -1,24 +1,15 @@
 package com.jero.project.controller;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.common.ProjectCommon;
-import com.jero.common.common.RoleCommon;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -47,14 +38,14 @@ import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.common.PayProjectCommon;
+import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayCompanyCommonProject;
 import com.jero.project.entity.PayWorkingGroupDistributionRecord;
 import com.jero.project.service.IPayCommonProjectService;
-import com.jero.project.entity.PayCommonProject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
 import com.jero.project.vo.PayCommonProjectOutput;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -62,8 +53,16 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 普通项目管理
@@ -280,6 +279,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 						if(!StringUtils.isBlank(listSysUserNew.get(0).getEmail())){
 							p.setPrincipalEmail(PasswordUtil.decrypt(listSysUserNew.get(0).getEmail()));
 						}
+						p.setPrincipalName(listSysUserNew.get(0).getRealname());
 					}
 				 }
 			 });

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

@@ -272,6 +272,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 							 if(!StringUtils.isBlank(listSysUserNew.get(0).getEmail())){
 								 p.setPrincipalEmail(PasswordUtil.decrypt(listSysUserNew.get(0).getEmail()));
 							 }
+							 p.setPrincipalName(listSysUserNew.get(0).getRealname());
 						 }
 					 }
 					 p.setOperationCycle(listPrincipalIdA.get(0).getOperationCycle());

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml

@@ -4,8 +4,43 @@
 
     <select id="queryPageList" resultType="com.jero.project.entity.PayCommonProject">
         SELECT
-            pcp.*
+            pcp.id,
+            pcp.charge_project,
+            pcp.year,
+            pcp.principal_id,
+            su.realname as principal_name,
+            pcp.charge_company_id,
+            pcp.charge_company_temporary_id,
+            pcp.charge_company_temporary_name,
+            pcp.charge_use,
+            pcp.contacts_id,
+            pcp.contacts_temporary_id,
+            pcp.contacts_temporary_name,
+            pcp.receivable_amount,
+            pcp.paid_amount,
+            pcp.mail_contacts_temporary_id,
+            pcp.mail_contacts_id,
+            pcp.mail_contacts_temporary_name,
+            pcp.pack,
+            pcp.need_invoice,
+            pcp.in_account,
+            pcp.make_invoice,
+            pcp.mail,
+            pcp.charge_way,
+            pcp.contract_num,
+            pcp.charge_notice_no,
+            pcp.charge_notice_id,
+            pcp.press_money_times,
+            pcp.remarks,
+            pcp.files,
+            pcp.create_by,
+            pcp.create_time,
+            pcp.update_by,
+            pcp.update_time,
+            pcp.invoice_amount,
+            pcp.payment_status
         FROM pay_common_project pcp
+        left join sys_user su on pcp.principal_id = su.id
 		LEFT JOIN pay_payment_record ppr ON ppr.project_id = pcp.id
 		<where>
             <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml

@@ -7,9 +7,9 @@
             working_group_project AS workingGroupProject,
             year,
             principal_id_a AS principalIdA,
-            principal_name_a AS principalNameA,
+            su.realname AS principalNameA,
             principal_id_b AS principalIdB,
-            principal_name_b AS principalNameB,
+            su1.realname AS principalNameB,
             convoke_num AS convokeNum,
             operation_cycle AS operationCycle,
             year_charge_a AS yearChargeA,
@@ -24,7 +24,10 @@
             pwg.create_time AS createTime,
             pwg.update_by AS updateBy,
             pwg.update_time AS updateTime
-        FROM pay_working_group pwg left join pay_meeting pm on pwg.id = pm.working_group_id
+        FROM pay_working_group pwg
+        left join sys_user su on pwg.principal_id_a = su.id
+        left join sys_user su1 on pwg.principal_id_b = su.id
+        left join pay_meeting pm on pwg.id = pm.working_group_id
         <where>
             <if test="payWorkingGroup.workingGroupProject != null and payWorkingGroup.workingGroupProject != ''">
                 AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%'))