离职流程变更

zjugis-business/src/main/java/com/zjugis/business/constants/DictConstants.java

@@ -107,4 +107,9 @@ public class DictConstants {
      * 评分标准
      */
     public static final String point_standard = "point_standard";
+
+    /**
+     * 员工所在地
+     */
+    public static final String location_type = "location_type";
 }

zjugis-business/src/main/java/com/zjugis/business/flow/resign/entity/ResignDO.java

@@ -103,6 +103,11 @@ public class ResignDO extends BaseEntity {
      */
     private LocalDateTime htdqs;
 
+    /**
+     * 员工所在地
+     */
+    private String lzygszd;
+
 
     //========================离职员工交接清单==================================
     /**
@@ -176,5 +181,4 @@ public class ResignDO extends BaseEntity {
     private BigDecimal clfscb21;//已结清
 
 
-
 }

zjugis-business/src/main/java/com/zjugis/business/flow/resign/event/ResignEvent.java

@@ -219,16 +219,15 @@ public class ResignEvent extends BaseController {
      * 工作接收人
      *
      * @param flowInstanceId
-     * @param state 1未完成 2已完成
      * @return
      */
-    @PostMapping("/workReceiver/{state}")
-    public String unfinishedReceiver(String flowInstanceId, @PathVariable String state) {
+    @PostMapping("/workReceiver")
+    public String unfinishedReceiver(String flowInstanceId) {
         try {
             if (StringUtils.isNotBlank(flowInstanceId)) {
                 ResignDO entity = resignService.findByInstanceId(flowInstanceId);
                 List<Map<String, String>> userMaps = new ArrayList<>();
-                List<ResignDetailDO> detailDOS = resignDetailService.getListByResignId(entity.getId(), state);
+                List<ResignDetailDO> detailDOS = resignDetailService.getListByResignId(entity.getId());
                 if (CollectionUtil.isNotEmpty(detailDOS)) {
 
 
@@ -258,37 +257,44 @@ public class ResignEvent extends BaseController {
 
     /**
      * 判断是否存在
-     *
-     * @param flowInstance
-     * @param type         1未完成 2已完成
-     * @param state        1不存在 2存在
-     * @return
      */
-    @PostMapping("/{type}/{state}")
-    public String exist(@ParamModel Map flowInstance, @PathVariable String type, @PathVariable String state) {
+    @PostMapping("/exist")
+    public String exist(@ParamModel Map flowInstance) {
+        try {
+            String flowInstanceId = flowInstance.get("id").toString();
+
+            ResignDO entity = resignService.findByInstanceId(flowInstanceId);
+            List<ResignDetailDO> detailDOS = resignDetailService.getListByResignId(entity.getId());
+
+
+            System.out.println(detailDOS.size());
+            if (CollectionUtil.isNotEmpty(detailDOS)) {
+                return "true";
+            } else {
+                return "false";
+            }
+
+
+        } catch (Exception ex) {
+            return error(ex.getMessage(), ErrorCode.DEFAULT);
+        }
+    }
+
+    /**
+     * 判断是否存在
+     */
+    @PostMapping("/location/{type}")
+    public String existLocation(@ParamModel Map flowInstance, @PathVariable String type) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
 
             ResignDO entity = resignService.findByInstanceId(flowInstanceId);
-            List<ResignDetailDO> detailDOS = resignDetailService.getListByResignId(entity.getId(), type);
-
-
-            switch (state) {
-                case "1":
-                    if (CollectionUtil.isEmpty(detailDOS)) {
-                        return "true";
-                    }
-                    break;
-
-                case "2":
-                    if (CollectionUtil.isNotEmpty(detailDOS)) {
-                        return "true";
-                    }
-                    break;
-                default:
-                    return "false";
+
+            if (type.equals(entity.getLzygszd())) {
+                return "true";
+            } else {
+                return "false";
             }
-            return "false";
 
 
         } catch (Exception ex) {

zjugis-business/src/main/java/com/zjugis/business/flow/resign/service/ResignDetailService.java

@@ -11,5 +11,5 @@ import java.util.Map;
 
 public interface ResignDetailService {
 
-    List<ResignDetailDO> getListByResignId(String id,String state);
+    List<ResignDetailDO> getListByResignId(String id);
 }

zjugis-business/src/main/java/com/zjugis/business/flow/resign/service/impl/ResignDetailServiceImpl.java

@@ -47,7 +47,7 @@ public class ResignDetailServiceImpl implements ResignDetailService {
     private ResignDetailDAO resignDetailDAO;
 
     @Override
-    public List<ResignDetailDO> getListByResignId(String id, String state) {
-        return resignDetailDAO.selectList(new LambdaQueryWrapperX<ResignDetailDO>().eq(ResignDetailDO::getResignId, id).eq(ResignDetailDO::getState, state));
+    public List<ResignDetailDO> getListByResignId(String id) {
+        return resignDetailDAO.selectList(new LambdaQueryWrapperX<ResignDetailDO>().eq(ResignDetailDO::getResignId, id));
     }
 }

zjugis-business/src/main/java/com/zjugis/business/flow/resign/service/impl/ResignServiceImpl.java

@@ -27,6 +27,7 @@ import com.zjugis.framework.workflow.utils.Select;
 import com.zjugis.module.adm.api.staff.StaffApi;
 import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 import com.zjugis.module.system.api.dict.DictDataApi;
+import com.zjugis.module.system.api.dict.dto.DictDataRespDTO;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.stereotype.Service;
@@ -164,8 +165,20 @@ public class ResignServiceImpl implements ResignService {
         Map<String, Object> map = new HashMap<>();
         map.put("formEntity", entity);
         //查字典
-        List<Select> typeList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.post_type).getCheckedData());
-        map.put("post_type", JSON.toJSONString(typeList));
+        List<DictDataRespDTO>resData = dictDataApi.getDictDataListByTypes(getTypeList()).getCheckedData();
+        Map<String, List<DictDataRespDTO>> map1 = new HashMap<>();
+        resData.forEach(v -> {
+            if (map1.get(v.getDictType()) != null) {
+                List<DictDataRespDTO> dtos = map1.get(v.getDictType());
+                dtos.add(v);
+                map1.put(v.getDictType(), dtos);
+            } else {
+                List<DictDataRespDTO> dtos = new ArrayList<>();
+                dtos.add(v);
+                map1.put(v.getDictType(), dtos);
+            }
+        });
+        map1.forEach((k, v) -> map.put(k, JSON.toJSONString(SelectConvert.INSTANCE.convertList(v))));
         //列表
         List<ResignDetailDO> detailDOS = resignDetailDAO.selectList(new LambdaQueryWrapperX<ResignDetailDO>().eq(ResignDetailDO::getResignId, entity.getId()));
         map.put("unfinishedList", JSON.toJSONString(detailDOS.stream().filter(v -> v.getState().equals("1")).collect(Collectors.toList())));
@@ -179,6 +192,13 @@ public class ResignServiceImpl implements ResignService {
         return map;
     }
 
+    private List<String> getTypeList() {
+        List<String> res = new ArrayList<>();
+        res.add(DictConstants.post_type);
+        res.add(DictConstants.location_type);
+        return res;
+    }
+
 
     private void validateExists(String id) {
         if (resignDAO.selectById(id) == null) {

zjugis-business/src/main/resources/templates/Resign/index.ftl

@@ -105,6 +105,24 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                                     </div>
                                 </div>
                             </td>
+
+                            <td class="th">
+                                <div class="form-label ">员工所在地：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-select" name="createReqVO$lzygszd"
+                                             data='${location_type!}' value="${formEntity.lzygszd!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+
+
                         </tr>
 
                         <tr>
@@ -135,7 +153,16 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                                     </div>
                                 </div>
                             </td>
+
+
+
+
+                            <td class="th">
+                            </td>
+                            <td>
+                            </td>
                         </tr>
+
                     </table>
                 </div>
 
@@ -317,7 +344,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                             <td style="width: 2%;"></td>
                             <td style="width: 60%;">未完成工作</td>
                             <td style="width: 15%;">接收人</td>
-                            <td style="width: 15%;">审核人</td>
+<#--                            <td style="width: 15%;">审核人</td>-->
                             <td style="width: 8%;">操作</td>
                         </tr>
                         </thead>
@@ -345,7 +372,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                             <td style="width: 2%;"></td>
                             <td style="width: 60%;">已完成工作成果</td>
                             <td style="width: 15%;">接收人</td>
-                            <td style="width: 15%;">审核人</td>
+<#--                            <td style="width: 15%;">审核人</td>-->
                             <td style="width: 8%;">操作</td>
                         </tr>
                         </thead>

zjugis-business/src/main/resources/templates/Resign/js/index.js

@@ -257,18 +257,18 @@
             + '</div>'
             + '</div>'
             + '</td>'
-            + '<td>'
-            + '<div class="form-flex">'
-            + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
-            + '<div class="z-comp-selecttree" name="review1[' + i + ']">'
-            + '<input type="hidden" name="ResignDetailDO1[' + i + ']$reviewer" value="' + finishedArray[i].reviewer + '">'
-            + '<div class="z-inputselect-bar">'
-            + '<span></span><i></i>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</td>'
+            // + '<td>'
+            // + '<div class="form-flex">'
+            // + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
+            // + '<div class="z-comp-selecttree" name="review1[' + i + ']">'
+            // + '<input type="hidden" name="ResignDetailDO1[' + i + ']$reviewer" value="' + finishedArray[i].reviewer + '">'
+            // + '<div class="z-inputselect-bar">'
+            // + '<span></span><i></i>'
+            // + '</div>'
+            // + '</div>'
+            // + '</div>'
+            // + '</div>'
+            // + '</td>'
             + '<td style="align-items: center">'
             + '<div style="display: flex;white-space: nowrap">'
             + '<div id="editBtnF_' + (i) + '" class="table-btn editBtnF_' + (i) + '" data-index="' + (i) + '">'
@@ -296,10 +296,10 @@
                 })
                 selecttree("[name='receive1[" + i + "]']", res, clickReceive)
 
-                res.forEach(obj => {
-                    obj.treeName = 'ResignDetailDO1[' + i + ']$reviewer';
-                })
-                selecttree("[name='review1[" + i + "]']", res, clickReview)
+                // res.forEach(obj => {
+                //     obj.treeName = 'ResignDetailDO1[' + i + ']$reviewer';
+                // })
+                // selecttree("[name='review1[" + i + "]']", res, clickReview)
 
 
                 //赋值
@@ -309,9 +309,9 @@
                 if (!(!finishedArray[i].receiver || finishedArray[i].receiver.trim() === '')) {
                     z.ui.selecttree("[name='receive1[" + i + "]']").setValue(finishedArray[i].receiver)
                 }
-                if (!(!finishedArray[i].reviewer || finishedArray[i].reviewer.trim() === '')) {
-                    z.ui.selecttree("[name='review1[" + i + "]']").setValue(finishedArray[i].reviewer)
-                }
+                // if (!(!finishedArray[i].reviewer || finishedArray[i].reviewer.trim() === '')) {
+                //     z.ui.selecttree("[name='review1[" + i + "]']").setValue(finishedArray[i].reviewer)
+                // }
 
 
                 if (read !== '1') {
@@ -395,18 +395,18 @@
             + '</div>'
             + '</div>'
             + '</td>'
-            + '<td>'
-            + '<div class="form-flex">'
-            + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
-            + '<div class="z-comp-selecttree" name="confirm[' + i + ']">'
-            + '<input type="hidden" name="ResignDetailDO[' + i + ']$confirmor" value="' + unfinishedArray[i].confirmor + '">'
-            + '<div class="z-inputselect-bar">'
-            + '<span></span><i></i>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</td>'
+            // + '<td>'
+            // + '<div class="form-flex">'
+            // + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
+            // + '<div class="z-comp-selecttree" name="confirm[' + i + ']">'
+            // + '<input type="hidden" name="ResignDetailDO[' + i + ']$confirmor" value="' + unfinishedArray[i].confirmor + '">'
+            // + '<div class="z-inputselect-bar">'
+            // + '<span></span><i></i>'
+            // + '</div>'
+            // + '</div>'
+            // + '</div>'
+            // + '</div>'
+            // + '</td>'
             + '<td style="align-items: center">'
             + '<div style="display: flex;white-space: nowrap">'
             + '<div id="editBtnU_' + (i) + '" class="table-btn editBtnU_' + (i) + '" data-index="' + (i) + '">'
@@ -434,10 +434,10 @@
                 })
                 selecttree("[name='receive[" + i + "]']", res, clickReceive)
 
-                res.forEach(obj => {
-                    obj.treeName = 'ResignDetailDO[' + i + ']$confirmor';
-                })
-                selecttree("[name='confirm[" + i + "]']", res, clickConfirm)
+                // res.forEach(obj => {
+                //     obj.treeName = 'ResignDetailDO[' + i + ']$confirmor';
+                // })
+                // selecttree("[name='confirm[" + i + "]']", res, clickConfirm)
 
 
                 //赋值
@@ -447,9 +447,9 @@
                 if (!(!unfinishedArray[i].receiver || unfinishedArray[i].receiver.trim() === '')) {
                     z.ui.selecttree("[name='receive[" + i + "]']").setValue(unfinishedArray[i].receiver)
                 }
-                if (!(!unfinishedArray[i].confirmor || unfinishedArray[i].confirmor.trim() === '')) {
-                    z.ui.selecttree("[name='confirm[" + i + "]']").setValue(unfinishedArray[i].confirmor)
-                }
+                // if (!(!unfinishedArray[i].confirmor || unfinishedArray[i].confirmor.trim() === '')) {
+                //     z.ui.selecttree("[name='confirm[" + i + "]']").setValue(unfinishedArray[i].confirmor)
+                // }
 
                 if (read !== '1') {
                     $("#editBtnU_" + i).click(function () {
@@ -515,7 +515,7 @@
     function detailWrite(i) {
         $("#delBtn_" + i).css("display", "block");
         $("[name='receive1[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
-        $("[name='review1[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
+        // $("[name='review1[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
         $("[name='ResignDetailDO1[" + i + "]$content']").removeClass("z-readonly").css("pointer-events", "auto");
     }
 
@@ -523,7 +523,7 @@
         //设置只读属性
         $("#delBtn_" + i).css("display", "none");
         $("[name='receive1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
-        $("[name='review1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
+        // $("[name='review1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
         $("[name='ResignDetailDO1[" + i + "]$content']").addClass("z-readonly").css("pointer-events", "none");
     }
 
@@ -531,7 +531,7 @@
     function detailWriteU(i) {
         $("#delBtn_" + i).css("display", "block");
         $("[name='receive[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
-        $("[name='confirm[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
+        // $("[name='confirm[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
         $("[name='ResignDetailDO[" + i + "]$content']").removeClass("z-readonly").css("pointer-events", "auto");
     }
 
@@ -539,7 +539,7 @@
     function detailReadonlyU(i) {
         $("#delBtn_" + i).css("display", "none");
         $("[name='receive[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
-        $("[name='confirm[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
+        // $("[name='confirm[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
         $("[name='ResignDetailDO[" + i + "]$content']").addClass("z-readonly").css("pointer-events", "none");
     }