Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/bean/dto/ContractInvoiceDto.java

@@ -3,6 +3,7 @@ package com.zjugis.business.bean.dto;
 import com.zjugis.framework.common.pojo.PageParam;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -24,6 +25,8 @@ public class ContractInvoiceDto extends PageParam {
 
     private String invoiceNumber;
 
+    private BigDecimal invoiceAmount;
+
     private String invoiceNo;
 
     private String contractName;

zjugis-business/src/main/java/com/zjugis/business/bean/entity/Project.java

@@ -69,6 +69,8 @@ public class Project extends BaseEntity {
     private Integer yggq;
 //验收时间
     private LocalDate yssj;
+
+    private LocalDate clickyssj;
 //验收单有效性
     private String ysdyxx;
 //归属公司ID

zjugis-business/src/main/java/com/zjugis/business/bean/request/ProjectRequest.java

@@ -86,4 +86,6 @@ public class ProjectRequest {
     private BigDecimal outputValue;
 
     private BigDecimal estimateAmount;
+
+    private LocalDate clickyssj;
 }

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractExcelResponse.java

@@ -25,6 +25,9 @@ public class ContractExcelResponse {
     @ExcelProperty(value = "合同费用状态",converter = ContractConverter.class)
     private Integer amountStatus;
 
+    @ExcelProperty("合同编号")
+    private String contractNumber;
+
     @ExcelProperty("合同名称")
     private String name;
 
@@ -55,9 +58,6 @@ public class ContractExcelResponse {
     @ExcelProperty("合同余额（元）")
     private BigDecimal contractBalance;
 
-    @ExcelProperty("合同编号")
-    private String contractNumber;
-
     @ExcelProperty("合同拿出日期")
     private LocalDate contractOn;
     //总产值

zjugis-business/src/main/java/com/zjugis/business/bean/response/ProjectExcelResponse.java

@@ -29,19 +29,12 @@ public class ProjectExcelResponse {
     @ExcelProperty(value = "项目状态",converter = ProjectConverter.class)
     private Integer xmzt;
 
-    @ExcelProperty(value = "验收单有效性")
-    private String ysdyxx;
-    //项目名称
-    @ExcelProperty("项目名称")
-    private String xmmc;
-    //项目编号
     @ExcelProperty("项目编号")
     private String xmbh;
-//    @ExcelProperty("行政区代码")
-//    private String xzqdm;
-//    // 行政区名称
-//    @ExcelProperty("行政区名称")
-//    private String xzqmc;
+    @ExcelProperty("项目名称")
+    private String xmmc;
+    @ExcelProperty("行政区名称")
+    private String xzqmc;
 //    // 项目类型名称
     @ExcelProperty("项目类型")
     private String projectTypeName;
@@ -51,9 +44,13 @@ public class ProjectExcelResponse {
     //预估工期（天）
     @ExcelProperty("预期工期")
     private Integer yggq;
+    @ExcelProperty("OA确认验收时间")
+    private LocalDate clickyssj;
     //验收时间
     @ExcelProperty("验收时间")
     private LocalDate yssj;
+    @ExcelProperty(value = "验收单有效性")
+    private String ysdyxx;
     //项目经理名称
     @ExcelProperty("项目经理")
     private String xmjl;

zjugis-business/src/main/java/com/zjugis/business/flow/projectStatus/event/ProjectStatusEvent.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -115,6 +116,7 @@ public class ProjectStatusEvent extends BaseController {
                     project.setYssj(entity.getAcceptTime());
                     project.setYsdyxx(entity.getAcceptState());
                     project.setXmzt(4);
+                    project.setClickyssj(LocalDate.now());
                 }else if("jx".equals(entity.getType())){
                     project.setXmzt(2);
                 }else if("zz".equals(entity.getType())){

zjugis-business/src/main/java/com/zjugis/business/service/impl/CustomerServiceImpl.java

@@ -120,6 +120,9 @@ public class CustomerServiceImpl implements CustomerService {
                 name=result.getData().getCode();
             }
         }
+        if(customer.getXzqdm()!=null){
+            customer.setXzqdm(name+"-"+area);
+        }
         Integer num =customerMapper.getIndexCode(customer);
         if(num==null){
             num=0;

zjugis-business/src/main/resources/mapper/oracle/ContractInvoiceMapper.xml

@@ -9,7 +9,7 @@
         LEFT JOIN CUSTOMER T3 ON T3.ID = T.PAY_COMPANY_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = T2.ZRBM_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS U ON U.ID = T2.XSRY_ID
-        LEFT JOIN (SELECT count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID,COALESCE(SUM(COALESCE(RETURN_AMOUNT,0)),0) as returnAmount FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T3 ON T3.CONTRACT_INVOICE_ID=T.ID
+        LEFT JOIN (SELECT count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID,COALESCE(SUM(COALESCE(RETURN_AMOUNT,0)),0) as returnAmount FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T4 ON T4.CONTRACT_INVOICE_ID=T.ID
         <where>
             T.ISVALID = 1
             <if test="params != null and params.deptId != null and params.deptId != ''">
@@ -21,6 +21,9 @@
             <if test="params != null and params.contractId != null and params.contractId != ''">
                 AND T.CONTRACT_ID = #{params.contractId,jdbcType=VARCHAR}
             </if>
+            <if test="params != null and params.invoiceAmount != null">
+                AND T.INVOICE_AMOUNT = #{params.invoiceAmount,jdbcType=DECIMAL}
+            </if>
             <if test="params != null and params.invoiceNo != null and params.invoiceNo != ''">
                 <bind name="invoiceNo" value="'%'+params.invoiceNo+'%'"/>
                 AND T.INVOICE_NO like #{invoiceNo}
@@ -57,16 +60,16 @@
                 AND T.INVOICE_DATE &lt;= #{params.invoiceOff,jdbcType=DATE}
             </if>
             <if test="params != null and params.returnOn != null">
-                AND T3.mind &gt;= #{params.returnOn,jdbcType=DATE}
+                AND T4.mind &gt;= #{params.returnOn,jdbcType=DATE}
             </if>
             <if test="params != null and params.returnOff != null">
-                AND T3.maxd &lt;= #{params.returnOff,jdbcType=DATE}
+                AND T4.maxd &lt;= #{params.returnOff,jdbcType=DATE}
             </if>
             <if test="params != null and params.isReturn == 1">
-                AND T3.rc &gt; 0
+                AND T4.rc &gt; 0
             </if>
             <if test="params != null and params.isReturn == 0">
-                AND T3.rc = 0
+                AND T4.rc = 0
             </if>
         </where>
         ORDER BY
@@ -80,8 +83,9 @@
         FROM CONTRACT_INVOICE T
         LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
         LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID
+        LEFT JOIN CUSTOMER T3 ON T3.ID = T.PAY_COMPANY_ID
         LEFT JOIN
-        (SELECT sum(NVL(RETURN_AMOUNT,0)) as returnAmount,count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T3 ON T3.CONTRACT_INVOICE_ID=T.ID
+        (SELECT sum(NVL(RETURN_AMOUNT,0)) as returnAmount,count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T4 ON T4.CONTRACT_INVOICE_ID=T.ID
         <where>
             T.ISVALID = 1
             <if test="params != null and params.deptId != null and params.deptId != ''">
@@ -93,6 +97,9 @@
             <if test="params != null and params.contractId != null and params.contractId != ''">
                 AND T.CONTRACT_ID = #{params.contractId,jdbcType=VARCHAR}
             </if>
+            <if test="params != null and params.invoiceAmount != null">
+                AND T.INVOICE_AMOUNT = #{params.invoiceAmount,jdbcType=DECIMAL}
+            </if>
             <if test="params != null and params.invoiceNumber != null and params.invoiceNumber != ''">
                 <bind name="invoiceNumber" value="'%'+params.invoiceNumber+'%'"/>
                 AND T.INVOICE_NUMBER like #{invoiceNumber}
@@ -118,6 +125,10 @@
             <if test="params != null and params.payCompanyId != null and params.payCompanyId != ''">
                 AND T.PAY_COMPANY_ID = #{params.payCompanyId,jdbcType=VARCHAR}
             </if>
+            <if test="params != null and params.payCompany != null and params.payCompany != ''">
+                <bind name="payCompany" value="'%'+params.payCompany+'%'"/>
+                AND T3.CUSTOMER_NAME like #{payCompany}
+            </if>
             <if test="params != null and params.invoiceOn != null">
                 AND T.INVOICE_DATE &gt;= #{params.invoiceOn,jdbcType=DATE}
             </if>
@@ -125,16 +136,16 @@
                 AND T.INVOICE_DATE &lt;= #{params.invoiceOff,jdbcType=DATE}
             </if>
             <if test="params != null and params.returnOn != null">
-                AND T3.mind &gt;= #{params.returnOn,jdbcType=DATE}
+                AND T4.mind &gt;= #{params.returnOn,jdbcType=DATE}
             </if>
             <if test="params != null and params.returnOff != null">
-                AND T3.maxd &lt;= #{params.returnOff,jdbcType=DATE}
+                AND T4.maxd &lt;= #{params.returnOff,jdbcType=DATE}
             </if>
             <if test="params != null and params.isReturn == 1">
-                AND T3.rc &gt; 0
+                AND T4.rc &gt; 0
             </if>
             <if test="params != null and params.isReturn == 0">
-                AND T3.rc = 0
+                AND T4.rc = 0
             </if>
         </where>
     </select>
@@ -149,7 +160,7 @@
         LEFT JOIN ZJUGIS_OA.SYSTEM_COMPANY C ON T3.ID = T.INVOICE_COMPANY_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_DEPT D ON D.ID = T2.ZRBM_ID
         LEFT JOIN ZJUGIS_OA.SYSTEM_USERS U ON U.ID = T2.XSRY_ID
-        LEFT JOIN (SELECT count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID,COALESCE(SUM(COALESCE(RETURN_AMOUNT,0)),0) as returnAmount FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T3 ON T3.CONTRACT_INVOICE_ID=T.ID
+        LEFT JOIN (SELECT count(1) as rc,max(RETURN_DATE) as maxd, min(RETURN_DATE) as mind,CONTRACT_INVOICE_ID,COALESCE(SUM(COALESCE(RETURN_AMOUNT,0)),0) as returnAmount FROM CONTRACT_RETURN_MONEY WHERE ISVALID = 1 GROUP BY CONTRACT_INVOICE_ID) T5 ON T5.CONTRACT_INVOICE_ID=T.ID
         <where>
             T.ISVALID = 1
             <if test="params != null and params.deptId != null and params.deptId != ''">
@@ -161,6 +172,9 @@
             <if test="params != null and params.contractId != null and params.contractId != ''">
                 AND T.CONTRACT_ID = #{params.contractId,jdbcType=VARCHAR}
             </if>
+            <if test="params != null and params.invoiceAmount != null">
+                AND T.INVOICE_AMOUNT = #{params.invoiceAmount,jdbcType=DECIMAL}
+            </if>
             <if test="params != null and params.invoiceNumber != null and params.invoiceNumber != ''">
                 <bind name="invoiceNumber" value="'%'+params.invoiceNumber+'%'"/>
                 AND T.INVOICE_NUMBER like #{invoiceNumber}
@@ -193,13 +207,13 @@
                 AND T.INVOICE_DATE &lt;= #{params.invoiceOff,jdbcType=DATE}
             </if>
             <if test="params != null and params.returnOn != null">
-                AND T3.mind &gt;= #{params.returnOn,jdbcType=DATE}
+                AND T5.mind &gt;= #{params.returnOn,jdbcType=DATE}
             </if>
             <if test="params != null and params.returnOff != null">
-                AND T3.maxd &lt;= #{params.returnOff,jdbcType=DATE}
+                AND T5.maxd &lt;= #{params.returnOff,jdbcType=DATE}
             </if>
             <if test="params != null and params.isReturn == 1">
-                AND T3.rc > 0
+                AND T5.rc > 0
             </if>
             <if test="params != null and params.idList != null">
                 and T.ID IN

zjugis-business/src/main/resources/mapper/oracle/ContractMessageMapper.xml

@@ -4,12 +4,11 @@
 
     <select id="page" resultType="com.zjugis.business.bean.response.ContractMessageResponse">
         SELECT cm.*,T2.ID as contractInvoiceId,T2.INSTANCE_ID as invoiceInstanceId,T3.PROJECT_ID as projectId FROM CONTRACT_MESSAGE cm
-        LEFT JOIN CONTRACT_RETURN_MONEY T1 on T1.ID = cm.BUSINESS_ID and cm.MESSAGE_TYPE = 2
-        LEFT JOIN CONTRACT_INVOICE T2 on T2.ID = T1.CONTRACT_INVOICE_ID
-        LEFT JOIN CONTRACT T3 on T3.ID = cm.CONTRACT_ID and cm.MESSAGE_TYPE = 1
+        LEFT JOIN CONTRACT_RETURN_MONEY T1 on T1.ID = cm.BUSINESS_ID and cm.MESSAGE_TYPE = 2 and T1.isvalid = 1
+        LEFT JOIN CONTRACT_INVOICE T2 on T2.ID = T1.CONTRACT_INVOICE_ID and T2.isvalid = 1 and T2.FLOW_STATUS >=90
+        LEFT JOIN CONTRACT T3 on T3.ID = t2.CONTRACT_ID and T3.FLOW_STATUS = 90 and T3.ISVALID = 1
         <if test="(params != null and params.deptId != null and params.deptId != '') or (params != null  and params.deptIds != null  and params.deptIds.size > 0)">
-            RIGHT JOIN CONTRACT c ON c.ID = cm.CONTRACT_ID
-            RIGHT JOIN PROJECT p ON p.ID = c.PROJECT_ID
+            RIGHT JOIN PROJECT p ON p.ID = T3.PROJECT_ID
         </if>
         <where>
             cm.ISVALID = 1

zjugis-business/src/main/resources/mapper/oracle/CustomerMapper.xml

@@ -31,7 +31,7 @@
             ISVALID = 1 and PID =#{id}
         </where>
     </select>
-    <select id="getIndexCode" resultType="com.zjugis.business.bean.response.CustomerResponse">
+    <select id="getIndexCode" resultType="java.lang.Integer">
         SELECT count(*)
         FROM CUSTOMER c
         <where>
@@ -40,7 +40,8 @@
                 AND c.BELONG_COMPANY_ID = #{params.belongCompanyId}
             </if>
             <if test="params != null and params.xzqdm != null and params.xzqdm != ''">
-                AND c.XZQDM = #{params.xzqdm}
+                <bind name="xzqdm" value="params.xzqdm+'%'"/>
+                AND c.CUSTOMER_NUMBER like #{xzqdm}
             </if>
         </where>
     </select>

zjugis-business/src/main/resources/templates/CommonCost/js/agentIndex.js

@@ -211,7 +211,7 @@
         }
         $("#selectProject_" + i).click(function () {
             detailProjectIndex = i;
-            selectProject(null, setProject);
+            selectProjectAll(null, setProject);
         })
         detailTotalInit(i)
         $("#editBtn_" + i).click(function () {

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/report/vo/comment/ReportCommentBaseVO.java

@@ -38,4 +38,9 @@ public class ReportCommentBaseVO {
     @Schema(description = "报告ID", example = "25673")
     private Long reportId;
 
+
+    @Schema(description = "回复的评论ID", example = "31918")
+    private Long replyToCommentId;
+
+
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/reportcomment/ReportCommentDO.java

@@ -44,6 +44,11 @@ public class ReportCommentDO extends BaseDO {
      * 被回复人用户ID
      */
     private String replyToUserid;
+
+    /**
+     * 被回复人评论ID
+     */
+    private Long replyToCommentId;
     /**
      * 主键ID
      */