Merge remote-tracking branch 'origin/master'

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java

@@ -60,12 +60,13 @@ public class PayMeetingSituation implements Serializable {
     private java.util.Date updateTime;
 
 	/**会议id*/
-	@Excel(name = "会议id", width = 15)
+	@Excel(name = "会议名称", width = 15,dictTable = "pay_meeting",dicCode = "id",dicText = "meeting_name")
     @ApiModelProperty(value = "会议id")
     @NotBlank(message = "会议项目不能为空")
     private String meetingId;
 
 	/**企业id*/
+    @Excel(name = "企业名称", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id")
     @ApiModelProperty(value = "企业id")
     @NotBlank(message = "企业名称不能为空")
     @Size(max = 50, message = "企业名称最大为50字符")
@@ -74,15 +75,14 @@ public class PayMeetingSituation implements Serializable {
     /**
      * 企业临时id
      */
-    @Excel(name = "会员单位", width = 15, dictTable = "pay_company_management_temporary", dicText = "company_name", dicCode = "id",orderNum = "1")
     private String companyTemporaryId;
 
 	/**企业名称*/
-	@Excel(name = "企业名称", width = 15)
     @ApiModelProperty(value = "企业名称")
     private String companyName;
 
 	/**企业联系人id*/
+    @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "企业联系人id")
     @NotBlank(message = "企业联系人不能为空")
     @Size(max = 50, message = "企业联系人最大为50字符")
@@ -91,33 +91,36 @@ public class PayMeetingSituation implements Serializable {
     /**
      * 企业联系人临时id
      */
-    @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
     private String companyContactTemporaryId;
 
 	/**企业联系人姓名*/
-	@Excel(name = "企业联系人姓名", width = 15)
     @ApiModelProperty(value = "企业联系人姓名")
     private String companyContactName;
 
 	/**职务*/
     @ApiModelProperty(value = "职务")
+    @Excel(name = "职务", width = 15)
     private String post;
 
 	/**手机号*/
     @ApiModelProperty(value = "手机号")
+    @Excel(name = "手机号", width = 15)
     private String phone;
 
 	/**邮箱*/
     @ApiModelProperty(value = "邮箱")
+    @Excel(name = "邮箱", width = 15)
     private String email;
 
 	/**身份*/
     @ApiModelProperty(value = "身份")
     @Dict(dicCode = "meet_identify_type")
+    @Excel(name = "身份", width = 15,dicCode = "meet_identify_type")
     private Integer identity;
 
 	/**嘉宾类型*/
     @ApiModelProperty(value = "嘉宾类型")
+    @Excel(name = "嘉宾类型", width = 15,dicCode = "guest_type")
     @NotNull(message = "请选择嘉宾类型",groups = Guest.class)
     @Min(value = 1,groups = Guest.class)
     @Max(value = 4,groups = Guest.class)
@@ -130,13 +133,11 @@ public class PayMeetingSituation implements Serializable {
     private String speechTopic;
 
 	/**演讲ppt*/
-	@Excel(name = "演讲ppt", width = 15)
     @ApiModelProperty(value = "演讲ppt")
     //@NotBlank(message = "演讲ppt不能为空",groups = Guest.class)
     private String speechPpt;
 
 	/**照片*/
-	@Excel(name = "照片", width = 15)
     @ApiModelProperty(value = "照片")
     private String photo;
 
@@ -146,19 +147,19 @@ public class PayMeetingSituation implements Serializable {
     private String profile;
 
 	/**是否用餐*/
-	@Excel(name = "是否用餐", width = 15)
+	@Excel(name = "是否用餐", width = 15,dicCode = "yn")
     @ApiModelProperty(value = "是否用餐")
     @Dict(dicCode = "yn")
     private Integer haveMeals;
 
 	/**是否回民*/
-	@Excel(name = "是否回民", width = 15)
+	@Excel(name = "是否回民", width = 15,dicCode = "yn")
     @ApiModelProperty(value = "是否回民")
     @Dict(dicCode = "yn")
     private Integer huiPeople;
 
 	/**是否入住协议酒店*/
-	@Excel(name = "是否入住协议酒店", width = 15)
+	@Excel(name = "是否入住协议酒店", width = 15,dicCode = "yn")
     @ApiModelProperty(value = "是否入住协议酒店")
     @Dict(dicCode = "yn")
     private Integer checkInHotel;
@@ -183,7 +184,7 @@ public class PayMeetingSituation implements Serializable {
     private String roomLayout;
 
     /**是否需要接站*/
-    @Excel(name = "是否需要接站", width = 15)
+    @Excel(name = "是否需要接站", width = 15,dicCode = "yn")
     @ApiModelProperty(value = "是否需要接站")
     @Dict(dicCode = "yn")
     private Integer pickUp;
@@ -206,7 +207,7 @@ public class PayMeetingSituation implements Serializable {
     private String arrivalShift;
 
 	/**是否需要送站*/
-	@Excel(name = "是否需要送站", width = 15)
+	@Excel(name = "是否需要送站", width = 15,dicCode = "yn")
     @ApiModelProperty(value = "是否需要送站")
     @Dict(dicCode = "yn")
     private Integer deliveryStation;
@@ -239,20 +240,19 @@ public class PayMeetingSituation implements Serializable {
     private String remark;
 
 	/**是否签到*/
-	@Excel(name = "是否签到", width = 15)
+	//@Excel(name = "是否签到", width = 15)
     @ApiModelProperty(value = "是否签到")
     @Dict(dicCode = "yn")
     private Integer checkIn;
 
 	/**邮寄联系人*/
-	@Excel(name = "邮寄联系人", width = 15)
+    @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "邮寄联系人")
     private String postContactId;
 
     /**
      * 邮寄联系人临时id
      */
-    @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
     private String postContactTemporaryId;
 
     /**
@@ -267,7 +267,7 @@ public class PayMeetingSituation implements Serializable {
     private String postContactAddress;
 
 	/**缴费方式*/
-	@Excel(name = "缴费方式", width = 15)
+	@Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
     @ApiModelProperty(value = "缴费方式")
     @NotNull(message = "缴费方式不能为空",groups = CommonPeople.class)
     @Min(1)
@@ -276,7 +276,7 @@ public class PayMeetingSituation implements Serializable {
     private Integer payMode;
 
 	/**需要发票*/
-	@Excel(name = "需要发票", width = 15)
+	@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
     @ApiModelProperty(value = "需要发票")
     @Min(0)
     @Max(2)
@@ -284,22 +284,18 @@ public class PayMeetingSituation implements Serializable {
     private Integer needInvoice;
 
 	/**付款凭证*/
-	@Excel(name = "付款凭证", width = 15)
     @ApiModelProperty(value = "付款凭证")
     private String paymentRecord;
 
 	/**状态（1未导入、2已导入、3参会人）*/
-	@Excel(name = "状态（1未导入、2已导入、3参会人）", width = 15)
     @ApiModelProperty(value = "状态（1未导入、2已导入、3参会人）")
     private Integer status;
 
 	/**是否为新增企业*/
-	@Excel(name = "是否为新增企业", width = 15)
     @ApiModelProperty(value = "是否为新增企业")
     private Integer newCompany;
 
     /**是否为新增联系人*/
-    @Excel(name = "是否为新增联系人", width = 15)
     @ApiModelProperty(value = "是否为新增联系人")
     private Integer newContact;
 
@@ -318,22 +314,22 @@ public class PayMeetingSituation implements Serializable {
     private BigDecimal paidAmount;
 
 	/**打包*/
-	@Excel(name = "打包", width = 15)
+	//@Excel(name = "打包", width = 15)
     @ApiModelProperty(value = "打包")
     private Integer pack;
 
 	/**到账*/
-	@Excel(name = "到账", width = 15)
+	//@Excel(name = "到账", width = 15)
     @ApiModelProperty(value = "到账")
     private Integer inAccount;
 
 	/**开票*/
-	@Excel(name = "开票", width = 15)
+	//@Excel(name = "开票", width = 15)
     @ApiModelProperty(value = "开票")
     private Integer makeInvoice;
 
 	/**邮寄*/
-	@Excel(name = "邮寄", width = 15)
+	//@Excel(name = "邮寄", width = 15)
     @ApiModelProperty(value = "邮寄")
     private Integer mail;
 
@@ -342,17 +338,17 @@ public class PayMeetingSituation implements Serializable {
     private Integer chargeUse;
 
     /**对接人id*/
-    @Excel(name = "对接人id", width = 15)
+    //@Excel(name = "对接人id", width = 15)
     @ApiModelProperty(value = "对接人id")
     private String dockId;
 
     /**对接人姓名*/
-    @Excel(name = "对接人姓名", width = 15)
+    //@Excel(name = "对接人姓名", width = 15)
     @ApiModelProperty(value = "对接人姓名")
     private String dockName;
 
     /**审核状态*/
-    @Excel(name = "审核状态", width = 15)
+    //@Excel(name = "审核状态", width = 15)
     @ApiModelProperty(value = "审核状态")
     @Dict(dicCode = "signup_status")
     private Integer checkResult;

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

@@ -30,7 +30,7 @@ import io.swagger.annotations.ApiOperation;
  * @Date:   2021-08-31
  * @Version: V1.0
  */
-@Api(tags="pay_payment_record")
+@Api(tags="到账开票")
 @RestController
 @RequestMapping("/paymentRecord/payPaymentRecord")
 @Slf4j
@@ -145,7 +145,8 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
     * 导出excel
     *
     */
-    @RequestMapping(value = "/exportXls")
+	@ApiOperation(value="导出excel", notes="导出excel")
+    @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject) {
         return payPaymentRecordService.exportXls(request, payCommonProject, PayCommonProject.class, "pay_payment_record");
     }

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

@@ -25,9 +25,9 @@ public interface PayPaymentRecordMapper extends BaseMapper<PayPaymentRecord> {
     List<PayCommonProject> mainList(Page page, @Param("payCommonProject")PayCommonProject payCommonProject);
 
     /**
-     * 到账开票主列表
+     * 到账开票导出
      * @param payCommonProject
      * @return
      */
-    List<PayCommonProject> mainList(@Param("payCommonProject")PayCommonProject payCommonProject);
+    List<PayCommonProject> mainListExportXls(@Param("payCommonProject")PayCommonProject payCommonProject);
 }

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

@@ -87,4 +87,90 @@
         order by create_time DESC
 
     </select>
+
+    <!--    到账开票导出-->
+    <select id="mainListExportXls" resultType="com.jero.project.entity.PayCommonProject">
+        <!-- 普通项目-->
+        select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType
+        from pay_common_project c
+        where
+        (c.receivable_amount <![CDATA[>]]> c.paid_amount
+        or (c.receivable_amount is not null and c.paid_amount is null))
+        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
+            AND c.principal_id = #{payCommonProject.principalId}
+        </if>
+        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
+            AND c.charge_project = #{payCommonProject.chargeProject}
+        </if>
+        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
+            AND c.charge_company_temporary_name = #{payCommonProject.chargeCompanyTemporaryName}
+        </if>
+        <!--工作组项目-->
+        UNION ALL
+        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,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
+        from pay_working_group g
+        inner join pay_working_group_subitem gsub on g.id = gsub.charge_company_id
+        where
+        (gsub.receivable_amount <![CDATA[>]]> gsub.paid_amount
+        or (gsub.receivable_amount is not null and gsub.paid_amount is null))
+        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
+            AND g.principal_id_a = #{payCommonProject.principalId}
+        </if>
+        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
+            AND g.working_group_project = #{payCommonProject.chargeProject}
+        </if>
+        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
+            AND gsub.charge_company_temporary_name = #{payCommonProject.chargeCompanyTemporaryName}
+        </if>
+        <!-- 会议项目-->
+        UNION ALL
+        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_name,sit.amount_receivable,sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3
+        from pay_meeting meeting
+        inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
+        where
+        (sit.amount_receivable <![CDATA[>]]> sit.paid_amount
+        or (sit.amount_receivable is not null and sit.paid_amount is null))
+        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
+            AND meeting.director_id = #{payCommonProject.principalId}
+        </if>
+        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
+            AND meeting.meeting_name = #{payCommonProject.chargeProject}
+        </if>
+        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
+            AND sit.company_name = #{payCommonProject.chargeCompanyTemporaryName}
+        </if>
+        <!-- 会员项目-->
+        UNION ALL
+        select msub.id,member.project_name,msub.charge_use,member.director_id,member.director_name,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4
+        from pay_member_project member
+        inner join pay_member_project_subitem msub on member.id=msub.project_id
+        where
+        (msub.amount_receivable <![CDATA[>]]> msub.paid_amount
+        or (msub.amount_receivable is not null and msub.paid_amount is null))
+        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
+            AND member.director_id = #{payCommonProject.principalId}
+        </if>
+        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
+            AND member.project_name = #{payCommonProject.chargeProject}
+        </if>
+        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
+            AND msub.company_name = #{payCommonProject.chargeCompanyTemporaryName}
+        </if>
+        <!-- 标协会员项目-->
+        UNION ALL
+        select tmsub.id,tmember.project_name,tmsub.charge_use,'','',tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5
+        from tb_member_project tmember
+        inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
+        where
+        (tmsub.amount_receivable <![CDATA[>]]> tmsub.paid_amount
+        or (tmsub.amount_receivable is not null and tmsub.paid_amount))
+        <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
+            AND tmember.project_name = #{payCommonProject.chargeProject}
+        </if>
+        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
+            AND tmsub.company_name = #{payCommonProject.chargeCompanyTemporaryName}
+        </if>
+        order by create_time DESC
+
+    </select>
 </mapper>

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

@@ -80,6 +80,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      * @return
      */
     public List<PayCommonProject> mainList(Page page, PayCommonProject payCommonProject){
+//        List<PayCommonProject> list=payPaymentRecordMapper.mainListExportXls(page, payCommonProject);
         return payPaymentRecordMapper.mainList(page, payCommonProject);
     }
 
@@ -327,7 +328,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
     public ModelAndView exportXls(HttpServletRequest request, PayCommonProject payCommonProject, Class<PayCommonProject> clazz, String title) {
 
         // Step.2 获取导出数据
-        List<PayCommonProject> pageList=payPaymentRecordMapper.mainList(payCommonProject);
+        List<PayCommonProject> pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject);
         List<PayCommonProject> exportList = null;
 
         // 过滤选中数据

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

@@ -32,7 +32,7 @@ import javax.validation.constraints.*;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="pay_common_project对象", description="pay_common_project")
-public class PayCommonProject extends PayPaymentRecord implements Serializable {
+public class PayCommonProject implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/