yzc 10 mesiacov pred
rodič
commit
36e3385f60

+ 2 - 1
hx-mes/src/main/resources/mapper/production/ProductionProcessesMapper.xml

@@ -12,7 +12,8 @@
                pp.create_user,
                pp.create_time,
                pp.update_user,
-               pp.update_time
+               pp.update_time,
+               pp.is_show
         from production_processes pp
             ${ew.customSqlSegment}
     </select>

+ 1 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -576,6 +576,7 @@ public class Contract extends BasePo {
      * 评审开始时间
      */
     private Date reviewBeginTime;
+    private Date reviewEndTime;
     //========================================================================
     /**
      * 交接单附件列表

+ 6 - 1
hx-sale/src/main/java/com/fjhx/sale/flow/ContractReviewFlow.java

@@ -14,6 +14,7 @@ import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractService;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 
 @Component
@@ -90,7 +91,11 @@ public class ContractReviewFlow extends FlowDelegate {
                 .ne(ContractProduct::getReviewStatus, FlowStatusEnum1.PASS.getKey())
         );
         if (count == 0) {
-            contractService.update(q -> q.eq(Contract::getId, contractProduct.getId()).set(Contract::getReviewStatus, FlowStatusEnum1.PASS.getKey()));
+            contractService.update(q -> q
+                    .eq(Contract::getId, contractProduct.getId())
+                    .set(Contract::getReviewStatus, FlowStatusEnum1.PASS.getKey())
+                    .set(Contract::getReviewEndTime, new Date())
+            );
         }
     }
 }