fix:承诺书上传

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java

@@ -51,6 +51,10 @@ public class ApplyInfoListManager {
         return applyInfoListService.selectTdAuditInfoListList(applyInfoListDTO);
     }
 
+    public List<TdApplyInfoList> selectPromiseInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
+        return applyInfoListService.selectPromiseInfoListList(applyInfoListDTO);
+    }
+
 
     @Transactional(rollbackFor = Exception.class)
     public boolean saveOrUpdate(TdApplyInfoListDTO applyInfoListDTO) {
@@ -82,7 +86,9 @@ public class ApplyInfoListManager {
     }
 
 
-
+    /**
+     * 上岗提交
+     */
     public boolean submit(String applyId) {
         return applyInfoListService.lambdaUpdate()
                 .eq(TdApplyInfoList::getApplyId,applyId)
@@ -91,8 +97,9 @@ public class ApplyInfoListManager {
     }
 
 
-
+    /**
-
+     * 审核通过
+     */
     public boolean submitAudit(String applyId) {
         return applyInfoListService.lambdaUpdate()
                 .eq(TdApplyInfoList::getApplyId,applyId)
@@ -102,6 +109,9 @@ public class ApplyInfoListManager {
 
 
 
+    /**
+     * 审核不通过
+     */
     public boolean goBack(String applyId,String applyMsg) {
         return applyInfoListService.lambdaUpdate()
                 .eq(TdApplyInfoList::getApplyId,applyId)
@@ -111,6 +121,16 @@ public class ApplyInfoListManager {
     }
 
 
+    /**
+     * 承诺书提交
+     */
+    public boolean submitPromise(String applyId) {
+        return applyInfoListService.lambdaUpdate()
+                .eq(TdApplyInfoList::getApplyId,applyId)
+                .set(TdApplyInfoList::getApplyStatus,5).update();
+    }
+
+
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/PromiseInfoListController.java

@@ -0,0 +1,81 @@
+package com.ruoyi.web.controller.system.apply;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.apply.TdApplyInfoList;
+import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO;
+import com.ruoyi.web.controller.manager.ApplyInfoListManager;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * ClassName: ApplyInfoListController
+ * Package: com.ruoyi.web.controller.system.apply
+ * Description:承诺书上传
+ *
+ * @Author wangxy
+ * @Create 2025/5/14 11:32
+ * @Version 1.0
+ */
+@Controller
+@RequestMapping("/system/promiseList")
+public class PromiseInfoListController extends BaseController {
+
+
+    private String prefix = "system/newdev/promise";
+
+
+    @Resource
+    private ApplyInfoListManager applyInfoListManager;
+
+    @RequiresPermissions("system:promise:view")
+    @GetMapping()
+    public String promiseListInfo() {
+        return prefix + "/promiseList";
+    }
+    /**
+     * 人员列表
+     */
+    @RequiresPermissions("system:promise:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdApplyInfoListDTO applyInfoListDTO) {
+        startPage();
+        List<TdApplyInfoList> tdApplyInfoLists = applyInfoListManager.selectPromiseInfoListList(applyInfoListDTO);
+        return getDataTable(tdApplyInfoLists);
+    }
+
+    /**
+     * 承诺书
+     */
+    @RequiresPermissions("system:promise:editPromise")
+    @GetMapping("/editPromise/{applyId}")
+    public String editPromise(@PathVariable("applyId") String applyId, ModelMap mmap) {
+        TdApplyInfoListDTO applyInfoList = applyInfoListManager.getTdApplyInfoList(applyId);
+        mmap.put("applyInfoList", applyInfoList);
+        return prefix + "/editAudit";
+    }
+
+    /**
+     * 承诺书提交
+     */
+    @PostMapping("/submitPromise")
+    @ResponseBody
+    public AjaxResult submitPromise(@RequestParam String applyId) {
+        return toAjax(applyInfoListManager.submitPromise(applyId));
+    }
+
+
+
+
+
+
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java

@@ -36,7 +36,7 @@ public class TdApplyInfoList extends BaseEntity {
     private String nationa;
 
     /**
-     * 申请状态（0：保存1：已提交，2，审核通过，3退回，4结束）
+     * 申请状态（0：保存1：已提交，2，审核通过，3退回，4培训教育提交，5承诺书上传）
      */
     private Integer applyStatus;
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java

@@ -22,6 +22,10 @@ public interface TdApplyInfoListMapper extends BaseMapper<TdApplyInfoList> {
     public List<TdApplyInfoList> selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO);
 
 
+    public List<TdApplyInfoList> selectPromiseInfoListList(TdApplyInfoListDTO applyInfoListDTO);
+
+
+
 
 }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java

@@ -21,5 +21,9 @@ public interface TdApplyInfoListService extends IService<TdApplyInfoList> {
     public List<TdApplyInfoList> selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO);
 
 
+    public List<TdApplyInfoList> selectPromiseInfoListList(TdApplyInfoListDTO applyInfoListDTO);
+
+
+
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java

@@ -42,6 +42,12 @@ public class TdApplyInfoListServiceImpl extends ServiceImpl<TdApplyInfoListMappe
     public List<TdApplyInfoList> selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
         return applyInfoListMapper.selectTdAuditInfoListList(applyInfoListDTO);
     }
+
+    @DataScope(deptAlias = "d")
+    @Override
+    public List<TdApplyInfoList> selectPromiseInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
+        return Collections.emptyList();
+    }
 }
 
 

ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml

@@ -132,6 +132,33 @@
         ORDER BY create_time DESC
 
     </select>
+    <select id="selectPromiseInfoListList" resultType="com.ruoyi.system.domain.apply.TdApplyInfoList">
+        select  <include refid="Base_Column_List"/> from  td_apply_info_list d
+        <trim prefix="where" prefixOverrides="and|or">
+            <if test="name!=null and name!=''">
+                AND name = #{name}
+            </if>
+            <if test="nationa!=null and nationa!=''">
+                AND nationa = #{nationa}
+            </if>
+            <if test="formerName!=null and formerName!=''">
+                AND former_name = #{formerName}
+            </if>
+            <if test="cerno!=null and cerno!=''">
+                AND cerno = #{cerno}
+            </if>
+            <if test="phone!=null and phone!=''">
+                AND phone = #{phone}
+            </if>
+            <if test="smPost!=null and smPost!=''">
+                AND sm_post = #{smPost}
+            </if>
+            AND  apply_status = '4'
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </trim>
+        ORDER BY create_time DESC
+    </select>
 
 
 </mapper>