消息修改

2021-09-28 10:06:27 +08:00
parent 1f00c179bc
commit eebfef1c99
14 changed files with 360 additions and 34 deletions
@@ -1,6 +1,10 @@
 package com.jero.common.common;

 public class ProjectCommon {
+    /**
+     * 超级管理员
+     */
+    public final static String ADMIN = "admin";
    /**
     * 打包（1：是，0：否）
     */
@@ -23,4 +23,12 @@ public interface ProjectDetailMapper {
     * @Exception
     */
    List<PayCommonProject> queryProjectList(List<String> list);
+
+    /**
+    * @Description 查询应收不等于实收的项目
+    * @Author  lqt
+    * @Date   2021/9/27
+    * @Exception
+    */
+    List<PayCommonProject> queryProjectReceivableNotEqualsPaid();
 }
@@ -117,4 +117,52 @@
            </if>
        </where>
    </select>
+
+    <select id="queryProjectReceivableNotEqualsPaid" resultType="com.jero.project.entity.PayCommonProject">
+        <!-- 普通项目-->
+        select c.id,c.charge_project,pcmt.phone as phone,pcmt.email as email
+        from pay_common_project c
+        left join pay_contacts_management_temporary pcmt on c.contacts_temporary_id = pcmt.id
+        where if(receivable_amount is null or receivable_amount = '',0,receivable_amount) >
+                if(paid_amount is null or paid_amount = '',0,paid_amount)
+        <!--工作组项目-->
+        UNION ALL
+        select gsub.id,g.working_group_project,pcmt.phone as phone,pcmt.email as email
+        from pay_working_group g
+        inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id
+        left join pay_contacts_management_temporary pcmt on gsub.contacts_temporary_id_one = pcmt.id
+        where if(receivable_amount is null or receivable_amount = '',0,receivable_amount) >
+        if(paid_amount is null or paid_amount = '',0,paid_amount)
+        <!-- 会议项目-->
+        UNION ALL
+        select sit.id,meeting.meeting_name,pcmt.phone as phone,pcmt.email as email
+        from pay_meeting meeting
+        inner join pay_meeting_situation sit on meeting.id = sit.meeting_id
+        left join pay_contacts_management_temporary pcmt on sit.company_contact_temporary_id = pcmt.id
+        where if(amount_receivable is null or amount_receivable = '',0,amount_receivable) >
+        if(paid_amount is null or paid_amount = '',0,paid_amount)
+        <where>
+            <if test="list != null and list.size() > 0">
+                AND sit.id  in
+                <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        <!-- 会员项目-->
+        UNION ALL
+        select msub.id,pmp.project_name,pcmt.phone as phone,pcmt.email as email
+        from pay_member_project pmp
+        inner join pay_member_project_subitem msub on pmp.id = msub.project_id
+        left join pay_contacts_management_temporary pcmt on msub.company_contact_temporary_id = pcmt.id
+        where if(amount_receivable is null or amount_receivable = '',0,amount_receivable) >
+        if(paid_amount is null or paid_amount = '',0,paid_amount)
+        <!-- 标协会员项目-->
+        UNION ALL
+        select tmsub.id,tmember.project_name,tmsub.mobile as phone,tmsub.email as email
+        from tb_member_project tmember
+        inner join tb_member_project_subitem tmsub on tmember.id = tmsub.project_id
+        where if(amount_receivable is null or amount_receivable = '',0,amount_receivable) >
+        if(paid_amount is null or paid_amount = '',0,paid_amount)
+    </select>
 </mapper>
@@ -0,0 +1,17 @@
+package com.jero.common.service;
+
+import com.jero.project.entity.PayCommonProject;
+
+import java.util.List;
+
+public interface ProjectReceivableNotEqualsPaidService {
+
+    /**
+     * @Description 查询应收不等于实收的项目
+     * @Author  lqt
+     * @Date   2021/9/27
+     * @Exception
+     */
+    List<PayCommonProject> queryProjectReceivableNotEqualsPaid();
+
+}
@@ -1,5 +1,7 @@
 package com.jero.common.service.impl;

+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.exception.JeroBootException;
@@ -7,6 +9,7 @@ import com.jero.common.mapper.ProjectDetailMapper;
 import com.jero.common.service.ProjectDetailService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.util.PasswordUtil;
+import com.jero.common.vo.PayMailBillVO;
 import com.jero.common.vo.ProjectDetailVO;
 import com.jero.common.vo.ProjectStatusVO;
 import com.jero.company.entity.PayCompanyManagement;
@@ -190,7 +193,14 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
        // 开票邮寄记录
        List<PayMailBill> listMailBillVO = payMailBillService.selectMailBillVO(projectId);
        if(!CollectionUtils.isEmpty(listMailBillVO)){
-            projectDetailVO.setMailBill(listMailBillVO);
+            String str = JSON.toJSONString(listMailBillVO);
+            List<PayMailBillVO> listPayMailBillVO = JSONArray.parseArray(str,PayMailBillVO.class);
+            listPayMailBillVO.forEach(p->{
+                if(!Objects.isNull(p.getPostStatus())){
+                    p.setPostStatus_dictText(sysBaseAPI.translateDict("mail_type",String.valueOf(p.getPostStatus())));
+                }
+            });
+            projectDetailVO.setMailBill(listPayMailBillVO);
        }
        return projectDetailVO;
    }
@@ -0,0 +1,21 @@
+package com.jero.common.service.impl;
+
+import com.jero.common.mapper.ProjectDetailMapper;
+import com.jero.common.service.ProjectReceivableNotEqualsPaidService;
+import com.jero.project.entity.PayCommonProject;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class ProjectReceivableNotEqualsPaidServiceImpl implements ProjectReceivableNotEqualsPaidService {
+
+    @Resource
+    private ProjectDetailMapper projectDetailMapper;
+
+    @Override
+    public List<PayCommonProject> queryProjectReceivableNotEqualsPaid() {
+        return projectDetailMapper.queryProjectReceivableNotEqualsPaid();
+    }
+}
@@ -0,0 +1,41 @@
+package com.jero.common.vo;
+
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jero.common.aspect.annotation.Dict;
+import com.jero.mail.entity.PayMailBill;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description: pay_mail_bill
+ * @Author: jeecg-boot
+ * @Date:   2021-09-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("pay_mail_bill")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_mail_bill对象", description="pay_mail_bill")
+public class PayMailBillVO extends PayMailBill implements Serializable {
+
+	/**邮寄状态(0:未邮寄，1::已邮寄)*/
+    @Dict(dicCode = "mail_type")
+    @ApiModelProperty(value = "邮寄状态")
+    private String postStatus_dictText;
+}
@@ -139,6 +139,6 @@ public class ProjectDetailVO implements Serializable {
     * 开票邮寄记录
     */
    @ApiModelProperty(value = "开票邮寄记录")
-    private List<PayMailBill> mailBill;
+    private List<PayMailBillVO> mailBill;

 }