工作组变更

jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml

@@ -47,11 +47,12 @@
             </where>
             <!--工作组项目-->
             UNION ALL
-            select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,
+            select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,su.realname,gsubc.contacts_temporary_id as contacts_temporary_id_one,gsubc.contacts_temporary_name as contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,
             if(gsub.paid_amount is null or gsub.paid_amount = '','0.00',gsub.paid_amount) as paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'',''
             from pay_working_group g
             left join sys_user su on g.principal_id_a = su.id
             inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
+            inner join pay_working_group_subitem_contacts gsubc on gsubc.working_group_sub_id = gsub.id and order_num=1
             <where>
                 <if test="companyId != null and companyId != ''">
                     AND gsub.charge_company_id = #{companyId}
@@ -175,10 +176,11 @@
         </where>
         <!--工作组项目-->
         UNION ALL
-        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,gsub.contacts_temporary_name_one
+        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,gsubc.contacts_temporary_name as contacts_temporary_name_one
         from pay_working_group g
         left join sys_user su on g.principal_id_a = su.id
         inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
+        inner join pay_working_group_subitem_contacts gsubc on gsubc.working_group_sub_id = gsub.id and order_num=1
         <where>
             <if test="projectId != null and projectId != ''">
                 AND gsub.id = #{projectId}
@@ -421,4 +423,4 @@
         LEFT JOIN pay_pack_company_project ppcp  ON project.id = ppcp.project_id
         LEFT JOIN pay_contacts_management_temporary pcmt ON pcmt.id = project.contacts_temporary_id
     </select>
-</mapper>
+</mapper>

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

@@ -1,33 +1,15 @@
 package com.jero.payment.controller;
 
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.enums.PaymentStatusEnum;
 import com.jero.common.system.base.controller.JeroController;
-import com.jero.common.system.query.QueryGenerator;
-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.util.AuthenticationUtils;
 import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.mail.PayMailBillVO;
-import com.jero.mail.entity.PayMailBill;
-import com.jero.mail.entity.PayMailBillProject;
 import com.jero.mail.service.IPayMailBillService;
-import com.jero.meeting.entity.PayMeetingSituation;
-import com.jero.member.entity.PayMemberProjectSubitem;
 import com.jero.member.entity.TbCertificatePayment;
 import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.service.ITbCertificatePaymentService;
@@ -35,17 +17,19 @@ import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.entity.PayCommonProject;
-import com.jero.project.entity.PayWorkingGroupSubItem;
 import com.jero.project.vo.PayCommonProjectOutput;
 import com.jero.standards.memberinfo.entity.MemberInfo;
-import io.lettuce.core.dynamic.annotation.Param;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
  /**
  * @Description: pay_payment_record
@@ -58,13 +42,13 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/paymentRecord/payPaymentRecord")
 @Slf4j
 public class PayPaymentRecordController extends JeroController<PayPaymentRecord, IPayPaymentRecordService> {
-	@Autowired
+	 @Resource
-	private IPayPaymentRecordService payPaymentRecordService;
+	 private IPayPaymentRecordService payPaymentRecordService;
-	@Autowired
+	 @Resource
-	private IPayMailBillService payMailBillService;
+	 private IPayMailBillService payMailBillService;
-	 @Autowired
+	 @Resource
 	 private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
-	 @Autowired
+	 @Resource
 	 private ITbCertificatePaymentService tbCertificatePaymentService;
 
 	/**
@@ -85,7 +69,7 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 		page.setRecords(pageList);
 		return Result.OK(page);
 	}
-	
+
 	/**
 	 *   添加来款
 	 * @return

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

@@ -40,10 +40,11 @@
       <!--工作组项目-->
         UNION ALL
         select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,gsub.charge_company_id,gsub.charge_company_temporary_name,gsub.receivable_amount,gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,
-               gsub.invoice_amount,gsub.mail_contacts_id,'' as register_check_result,gsub.contacts_temporary_name_one,gsub.payment_status,gsub.charge_company_temporary_id
+               gsub.invoice_amount,gsub.mail_contacts_id,'' as register_check_result,gsubc.contacts_temporary_name as contacts_temporary_name_one,gsub.payment_status,gsub.charge_company_temporary_id
         from pay_working_group g
         left join sys_user su on g.principal_id_a = su.id
         inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
+        inner join pay_working_group_subitem_contacts gsubc on gsubc.working_group_sub_id = gsub.id and order_num=1
         where
         gsub.receivable_amount <![CDATA[<>]]> 0
         and gsub.receivable_amount is not null
@@ -425,4 +426,4 @@
     <select id="getMonthProjectCount" resultType="java.lang.Integer">
         select count(*) from (select * from pay_payment_record WHERE DATE_FORMAT(payment_date,'%Y-%m') = #{time} group by project_id) aa
     </select>
-</mapper>
+</mapper>