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

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 /**
  * @author ljy
@@ -65,7 +66,7 @@ public class ProjectRequest {
     /**
      * 验收时间
      */
-    private String yssj;
+    private LocalDate yssj;
     /**
      * 项目状态
      */

zjugis-business/src/main/java/com/zjugis/business/flow/contractF/event/ContractFEvent.java

@@ -1,7 +1,11 @@
 package com.zjugis.business.flow.contractF.event;
 
+import com.zjugis.business.bean.entity.Contract;
+import com.zjugis.business.bean.entity.Project;
 import com.zjugis.business.flow.contractF.entity.ContractFDO;
 import com.zjugis.business.flow.contractF.service.ContractFService;
+import com.zjugis.business.service.ContractService;
+import com.zjugis.business.service.ProjectService;
 import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.workflow.exception.BusinessException;
 import com.zjugis.framework.workflow.model.BaseController;
@@ -34,7 +38,8 @@ import static com.zjugis.business.constants.FlowStatusConstants.*;
 public class ContractFEvent extends BaseController {
 
 
-
+    @Resource
+    private ProjectService projectService;
     @Resource
     private ContractFService contractFService;
 
@@ -183,23 +188,27 @@ public class ContractFEvent extends BaseController {
 
 
     /**
-     * 转到部门经理
+     * 转到项目经理和销售人员
      */
-    @PostMapping("/to-dept-manager")
+    @PostMapping("/to-project-manager-sale")
     public String toDeptManager(String flowInstanceId) {
         try {
             if (StringUtils.isNotBlank(flowInstanceId)) {
                 ContractFDO entity = contractFService.findByInstanceId(flowInstanceId);
                 List<Map<String, String>> userMaps = new ArrayList<>();
-//                if (StringUtils.isNotBlank(entity.getDeptId())) {
-//                    CommonResult<DeptRespDTO> result = deptApi.getDept(entity.getDeptId());
-//                    DeptRespDTO dept = result.getCheckedData();
-//                    if (dept != null && StringUtils.isNotBlank(dept.getLeaderUserId())) {
-//                        HashMap<String, String> map = new HashMap<>();
-//                        map.put("id", dept.getLeaderUserId());
-//                        userMaps.add(map);
-//                    }
-//                }
+                if (StringUtils.isNotBlank(entity.getContractId())) {
+                    Project project = projectService.selectById(entity.getContractId());
+                    if(StringUtils.isNotBlank(project.getXmjlId())) {
+                        HashMap<String,String> map = new HashMap<>();
+                        map.put("id",project.getXmjlId());
+                        userMaps.add(map);
+                    }
+                    if(StringUtils.isNotBlank(project.getXsryId())) {
+                        HashMap<String,String> map = new HashMap<>();
+                        map.put("id",project.getXsryId());
+                        userMaps.add(map);
+                    }
+                }
                 return ok(userMaps);
             } else {
                 throw new BusinessException("找不到流程id");

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

@@ -112,7 +112,7 @@ public class ProjectStatusEvent extends BaseController {
                 ProjectResponse projectResponse=projectService.selectWithChildren(entity.getProjectId());
                 List<ProjectResponse> children =projectResponse.getChildren();
                 if("ys".equals(entity.getType())){
-                    project.setYssj(entity.getAcceptTime()!=null?entity.getAcceptTime().toString():null);
+                    project.setYssj(entity.getAcceptTime());
                     project.setYsdyxx(entity.getAcceptState());
                     project.setXmzt(4);
                 }else if("jx".equals(entity.getType())){

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

@@ -230,8 +230,8 @@
             COALESCE(SUM(CASE WHEN T.XMZT = 4 THEN 1 ELSE 0 END),0) as accepted,
             COALESCE(SUM(CASE WHEN T.XMZT = 1 THEN 1 ELSE 0 END),0) as unaccepted
         FROM PROJECT T
-                 LEFT JOIN CONTRACT T1 ON T1.PROJECT_ID = T.ID
-        WHERE T.ISVALID = 1
+                 LEFT JOIN CONTRACT T1 ON T1.PROJECT_ID = T.ID AND T1.FLOW_STATUS = 90 AND T1.ISVALID = 1
+        WHERE T.ISVALID = 1 AND T.FLOW_STATUS = 90
         <if test="params != null  and params.deptIds != null  and params.deptIds.size > 0">
             AND T.ZRBM_ID in
             <foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">
@@ -249,8 +249,8 @@
             COALESCE(SUM(CASE WHEN T1.CONTRACT_AMOUNT &gt;= 3000000 and T1.CONTRACT_AMOUNT &lt; 4000000 THEN 1 ELSE 0 END),0) as lt400,
             COALESCE(SUM(CASE WHEN T1.CONTRACT_AMOUNT &gt;= 4000000 THEN 1 ELSE 0 END),0) as gte400
         FROM PROJECT T
-            LEFT JOIN CONTRACT T1 ON T1.PROJECT_ID = T.ID
-        WHERE T.ISVALID = 1
+            LEFT JOIN CONTRACT T1 ON T1.PROJECT_ID = T.ID AND T1.FLOW_STATUS = 90 AND T1.ISVALID = 1
+        WHERE T.ISVALID = 1 AND T.FLOW_STATUS = 90
         <if test="params != null  and params.deptIds != null  and params.deptIds.size > 0">
             AND T.ZRBM_ID in
             <foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">
@@ -273,7 +273,7 @@
             WHERE STATE = 1 AND ISVALID = 1
             GROUP BY PROJECT_ID
             ) T1 ON T1.PROJECT_ID = T.ID
-        WHERE T.ISVALID = 1
+        WHERE T.ISVALID = 1  AND T.FLOW_STATUS = 90
         <if test="params != null  and params.deptIds != null  and params.deptIds.size > 0">
             AND T.ZRBM_ID in
             <foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">

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

@@ -156,6 +156,28 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                               </div>
                           </td>
                       </tr>
+                      <tr>
+                          <td class="th">
+                              <div class="form-label">签订时间：</div>
+                          </td>
+                          <td>
+                              <div class="form-group">
+                                  <div class="z-comp-date" name="contract$signTime">
+                                      <input type="text" value="${formEntity.signTime!}">
+                                  </div>
+                              </div>
+                          </td>
+                          <td class="th">
+                              <div class="form-label">履约到期时间：</div>
+                          </td>
+                          <td>
+                              <div class="form-group">
+                                  <div class="z-comp-date" name="contract$dueTime">
+                                      <input type="text" value="${formEntity.dueTime!}">
+                                  </div>
+                              </div>
+                          </td>
+                      </tr>
                       <tr>
                           <td class="th">
                               <div class="form-label">事业部独立开拓：</div>

zjugis-business/src/main/resources/templates/FlowContractSub/js/outsourcingApply.js

@@ -29,8 +29,7 @@
                         genFlag = false;
                     },
                     onConfirm: function () {
-                        var params = {"projectType": 'WB',"xzqh": ''};
-                        var postdata = {"name": '外包合同编号',"params": params}
+                        var postdata = {"name": '外包合同编号'}
                         if(genFlag){
                             z.ui.ajax({
                                 type: "post",

zjugis-business/src/main/resources/templates/FlowContractSub/js/subcontractApply.js

@@ -29,8 +29,7 @@
                         genFlag = false;
                     },
                     onConfirm: function () {
-                        var params = {"projectType": 'FB',"xzqh": ''};
-                        var postdata = {"name": '分包合同编号',"params": params}
+                        var postdata = {"name": '分包合同编号'}
                         if(genFlag){
                             z.ui.ajax({
                                 type: "post",

zjugis-workflow/src/main/java/com/zjugis/z_workflow/serviceApi/FlowInstanceApiController.java

@@ -291,7 +291,14 @@ public class FlowInstanceApiController extends BaseController {
 
     @PostMapping
     public CommonResult<String> getFlowUrl(@Valid @RequestBody IFlowInstanceReq iFlowInstanceReq){
-        String flowUrl = iActivityInstanceService.getHandlerUrl(iFlowInstanceReq.getActivityInsId(),iFlowInstanceReq.getFlowInstanceId(),null,iFlowInstanceReq.getUserId(),iFlowInstanceReq.getMobile(),iFlowInstanceReq.getView(),null);
+        String participantId = "";
+        if (StringUtils.isNotBlank(iFlowInstanceReq.getUserId())) {
+            IActivityInsParticiPant particiPant = iActivityInsParticiPantService.getByActivityInsIdAndUserId(iFlowInstanceReq.getActivityInsId(), iFlowInstanceReq.getUserId());
+            if (Objects.nonNull(particiPant)) {
+                participantId = particiPant.getId();
+            }
+        }
+        String flowUrl = iActivityInstanceService.getHandlerUrl(iFlowInstanceReq.getActivityInsId(),iFlowInstanceReq.getFlowInstanceId(),participantId,iFlowInstanceReq.getUserId(),iFlowInstanceReq.getMobile(),iFlowInstanceReq.getView(),null);
         return CommonResult.success(flowUrl);
     }
 }