项目进度

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

@@ -53,5 +53,10 @@ public class ProjectMilestone extends BaseEntity {
      */
     private String projectId;
 
+    /**
+     * 项目进度
+     */
+    private String process;
+
 }
 

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

@@ -10,6 +10,8 @@ import com.zjugis.business.constants.ContractMessageContants;
 import com.zjugis.business.mapper.ContractMessageMapper;
 import com.zjugis.business.service.ContractMessageService;
 import com.zjugis.business.service.ContractService;
+import com.zjugis.module.infra.api.ding.DingApi;
+import com.zjugis.module.infra.api.ding.dto.DingMessageDto;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +36,9 @@ public class ContractMessageServiceImpl implements ContractMessageService {
     @Autowired
     private ContractService contractService;
 
+    @Autowired
+    private DingApi dingApi;
+
 
     @Override
     public Page<ContractMessageResponse> page(ContractMessageDto contractMessageDto) {
@@ -106,7 +111,10 @@ public class ContractMessageServiceImpl implements ContractMessageService {
         BigDecimal amount = contractReturnMoney.getReturnAmount().setScale(2, RoundingMode.HALF_UP);
         String content = "[回款]已回款：¥" + amount +  " " + StringUtils.join(Arrays.asList(contract.getName(), contract.getContractOn(),"¥" + amount,contract.getAreaManager()),"/");
         message.setMessageContent(content);
-        contractMessageMapper.insert(message);
+        int insert = contractMessageMapper.insert(message);
+        if(insert> 0){
+            dingApi.sendMessage(new DingMessageDto(contract.getAreaManagerId(),content));
+        }
     }
 }
 

zjugis-business/src/main/resources/templates/FlowProject/apply.ftl

@@ -285,7 +285,7 @@
               <td>序号</td>
               <td>里程碑信息</td>
               <td>计划完成时间</td>
-              <td>实际完成时间</td>
+              <td>项目进度</td>
               <td>操作</td>
             </tr>
             </thead>

zjugis-business/src/main/resources/templates/FlowProject/js/apply.js

@@ -102,7 +102,7 @@
         let obj = {
           name: milestoneList[i].name || "",
           planFinishTime: milestoneList[i].planFinishTime || "",
-          actualFinishTime: milestoneList[i].actualFinishTime || "",
+          process: milestoneList[i].process || "",
           id: milestoneList[i].id || "",
           projectId: milestoneList[i].projectId || projectId,
           sortnum: milestoneList[i].sortnum || ""
@@ -211,7 +211,7 @@
     let qjsjElements = document.getElementsByName("project_milestone_seq");
     var dataObj = {
       name: "",
-      actualFinishTime: "",
+      process: "100%",
       planFinishTime: "",
       id: "",
       projectId: projectId,
@@ -257,7 +257,6 @@
       }
     })
     z.ui.date("[name='ProjectMilestone[" + (lists.length-1) + "]$planFinishTime']").init()
-    z.ui.date("[name='ProjectMilestone[" + (lists.length-1) + "]$actualFinishTime']").init()
     buildSeq();
   }
 
@@ -298,8 +297,8 @@
           + '<td>'
           + '<div class="form-flex">'
           + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
-          + '<div class="z-comp-input" name="ProjectMilestone[' + i + ']$actualFinishTime">'
-          + '<input type="text" value="'+lists[i].actualFinishTime+'">'
+          + '<div class="z-comp-input" name="ProjectMilestone[' + i + ']$process">'
+          + '<input type="text" value="'+lists[i].process+'">'
           + '</div>'
           + '</div>'
           + '</div>'
@@ -316,7 +315,6 @@
     tbodyQjsq.innerHTML = html
     for (let i = 0; i < lists.length; i++) {
       z.ui.date("[name='ProjectMilestone[" + i + "]$planFinishTime']").init()
-      z.ui.date("[name='ProjectMilestone[" + i + "]$actualFinishTime']").init()
       $("#delBtn_" + i).click(function () {
         z.ui.confirm("compid").init({
           content: "确定删除吗？",
@@ -389,8 +387,8 @@
         + '<td>'
         + '<div class="form-flex">'
         + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
-        + '<div class="z-comp-input" name="ProjectMilestone[' + index + ']$actualFinishTime">'
-        + '<input type="text" value="">'
+        + '<div class="z-comp-input" name="ProjectMilestone[' + index + ']$process">'
+        + '<input type="text" value="100%">'
         + '</div>'
         + '</div>'
         + '</div>'

zjugis-module-infra/zjugis-module-infra-api/src/main/java/com/zjugis/module/infra/api/ding/dto/DingMessageDto.java

@@ -1,5 +1,6 @@
 package com.zjugis.module.infra.api.ding.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -11,6 +12,7 @@ import java.io.Serializable;
  * @date 2024/4/10 17:35
  */
 @Data
+@AllArgsConstructor
 public class DingMessageDto implements Serializable {
 
     @NotBlank