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

client_h5/src/pages/resign/index.vue

@@ -53,6 +53,13 @@
               placeholder="离职生效日期"
               readonly
           />
+          <van-field
+              v-model="formData.lzygszdText"
+              name="员工所在地"
+              label="员工所在地"
+              placeholder="员工所在地"
+              readonly
+          />
           <van-field
               v-model="formData.lzyyc"
               name="离职原因"
@@ -138,6 +145,7 @@ const initFormData = async () => {
   formData.value = result.data
 
   formData.value.drzwText = getDictLabel(DICT_TYPE.POST_TYPE, formData.value.drzw);
+  formData.value.lzygszdText = getDictLabel(DICT_TYPE.POST_TYPE, formData.value.lzygszd);
 
   formData.value.rgssjc = formatDate(formData.value.rgssj);
   formData.value.htdqsc = formatDate(formData.value.htdqs);

client_h5/src/router/index.ts

@@ -14,7 +14,7 @@ const router = createRouter({
 })
 
 // 路由加载前
-router.beforeEach(async (to, from, next) => {
+router.beforeEach((to, from, next) => {
   getUserInfoPromise(true).then((isLogin) => {
     next(); 
     if (!isLogin) {

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

@@ -139,7 +139,7 @@ public class ResignServiceImpl implements ResignService {
         }
 
         ResignApplyDO resignApplyDO = resignApplyService.findByUserId(aDo.getUserId());
-        if (resignApplyDO == null) {
+        if (resignApplyDO == null && aDo.getFlowStatus() != 90) {
             throw exception(RESIGN_APPLY_FIRST);
         }
 

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

@@ -472,6 +472,8 @@
 
     function detailReadonly(i) {
         //设置只读属性
+        $("#addDataUnfinished").css("display", "none");
+        $("#addDataFinished").css("display", "none");
         $("#delBtn_" + i).css("display", "none");
         $("[name='receive1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
         $("[name='ResignFinishedDetailDO[" + i + "]$content']").addClass("z-readonly").css("pointer-events", "none");

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/api/staff/StaffApiImpl.java

@@ -32,7 +32,7 @@ public class StaffApiImpl implements StaffApi {
     @Override
     public CommonResult<String> updateStaffState(StaffStateDTO dto) {
         RecordsRespVO vo = recordsService.getRecordDetail(dto.getUserId());
-        vo.setState(dto.getState());
+        vo.setState(String.valueOf(dto.getState()));
         return success(recordsService.updateStaff(vo));
     }
 

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/staff/vo/records/RecordsBaseVO.java

@@ -300,4 +300,9 @@ public class RecordsBaseVO {
      * 毕业时间
      */
     private LocalDate bysj;
+
+    /**
+     * 司龄
+     */
+    private Integer sl;
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -145,7 +145,14 @@ public class RecordsServiceImpl implements RecordsService {
         //学校信息
         List<SchoolDetailDO> schoolList = schoolDetailDOMapper.selectList(new LambdaQueryWrapperX<SchoolDetailDO>().eq(SchoolDetailDO::getUserId, userId));
         if (CollectionUtil.isNotEmpty(schoolList)) {
-            vo.setSchoolList(schoolList);
+            List<SchoolDetailDO> schools = schoolList.stream().sorted(
+                    (o1, o2) -> {
+                        int b1 = Integer.parseInt(o1.getXl());
+                        int b2 = Integer.parseInt(o2.getXl());
+                        return Integer.compare(b1, b2);
+                    }
+            ).collect(Collectors.toList());
+            vo.setSchoolList(schools);
         }
 
         //工作经历