1、新增依申请公开处理单更新和删除接口

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/enums/ErrorCodeConstants.java

@@ -52,4 +52,6 @@ public interface ErrorCodeConstants {
     ErrorCode PROCUREMENT_NOT_EXISTS = new ErrorCode(1_003_012_000, "采购申请记录不存在");
 
     ErrorCode SUPPLIER_INFO_NOT_EXISTS = new ErrorCode(1_003_013_000, "该供应商不存在");
+
+    ErrorCode APPLICATION_INFO_NOT_EXISTS = new ErrorCode(1_003_014_000, "公开处理单不存在");
 }

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/applicationinfo/controller/ApplicationInfoController.java

@@ -3,13 +3,12 @@ package com.zjugis.module.business.flow.applicationinfo.controller;
 import com.zjugis.framework.workflow.model.BaseController;
 import com.zjugis.framework.workflow.workflow.WorkFlow;
 import com.zjugis.module.business.flow.applicationinfo.service.IApplicationInfoService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import com.zjugis.module.business.flow.applicationinfo.vo.ApplicationInfoVO;
+import com.zjugis.module.business.flow.procurement.vo.ProcurementVO;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.Map;
 
 /**
@@ -25,7 +24,7 @@ public class ApplicationInfoController extends BaseController {
     private IApplicationInfoService infoService;
 
     /**
-     * 获取采购申请表流程表单
+     * 获取依申请公开处理单流程表单
      *
      * @param activityTemplateId
      * @param flowInstanceId
@@ -41,4 +40,25 @@ public class ApplicationInfoController extends BaseController {
         return resultPage(map);
     }
 
+    /**
+     * 更新依申请公开处理单流程
+     * @param updateReqVO
+     * @return
+     */
+    @PostMapping("/update")
+    public String updateApplicationInfo(@Valid @RequestBody ApplicationInfoVO updateReqVO) {
+        infoService.updateApplicationInfo(updateReqVO);
+        return success(true);
+    }
+
+    /**
+     * 删除依申请公开处理单流程
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/delete")
+    public String deleteApplicationInfo(@RequestParam("id") String id) {
+        infoService.deleteApplicationInfo(id);
+        return success(true);
+    }
 }

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/applicationinfo/entity/ApplicationInfo.java

@@ -128,7 +128,7 @@ public class ApplicationInfo extends BaseEntity {
      * 流程状态
      */
     @TableField("flow_status")
-    private BigDecimal flowStatus;
+    private Integer flowStatus;
 
     /**
      * 流程结束时间

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/applicationinfo/service/IApplicationInfoService.java

@@ -1,6 +1,7 @@
 package com.zjugis.module.business.flow.applicationinfo.service;
 
 import com.zjugis.module.business.flow.applicationinfo.entity.ApplicationInfo;
+import com.zjugis.module.business.flow.applicationinfo.vo.ApplicationInfoVO;
 
 import java.util.Map;
 
@@ -15,4 +16,9 @@ public interface IApplicationInfoService {
     Map<String, Object> getFormParams(String flowInstanceId, String userId);
 
     ApplicationInfo findByInstanceId(String flowInstanceId);
+
+    void updateApplicationInfo(ApplicationInfoVO updateReqVO);
+
+    void deleteApplicationInfo(String id);
+
 }

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/applicationinfo/service/impl/ApplicationInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zjugis.module.business.flow.applicationinfo.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSON;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
@@ -10,7 +11,7 @@ import com.zjugis.module.business.constants.DictConstants;
 import com.zjugis.module.business.converter.common.SelectConvert;
 import com.zjugis.module.business.flow.applicationinfo.entity.ApplicationInfo;
 import com.zjugis.module.business.flow.applicationinfo.service.IApplicationInfoService;
-import com.zjugis.module.business.flow.procurement.entity.ProcurementApplication;
+import com.zjugis.module.business.flow.applicationinfo.vo.ApplicationInfoVO;
 import com.zjugis.module.business.mapper.ApplicationInfoMapper;
 import com.zjugis.module.system.api.dict.DictDataApi;
 import com.zjugis.module.system.api.user.AdminUserApi;
@@ -25,6 +26,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.zjugis.module.business.enums.ErrorCodeConstants.APPLICATION_INFO_NOT_EXISTS;
+
 /**
  * 服务实现类
  *
@@ -57,6 +61,7 @@ public class ApplicationInfoServiceImpl implements IApplicationInfoService {
                 entity.setReceiveNumber(flowInstance.getCode());
                 entity.setReceiveTime(LocalDateTime.now());
                 entity.setCreateTime(LocalDateTime.now());
+                entity.setIsvalid(1);
                 CommonResult<AdminUserRespDTO> result = adminUserApi.getUser(userId);
                 if (result.isSuccess()) {
                     entity.setInputPerson(result.getData().getNickname());
@@ -75,6 +80,19 @@ public class ApplicationInfoServiceImpl implements IApplicationInfoService {
         return infoMapper.findByInstanceId(flowInstanceId);
     }
 
+    @Override
+    public void updateApplicationInfo(ApplicationInfoVO updateReqVO) {
+        validateCommonCostExists(updateReqVO.getId());
+        ApplicationInfo applicationInfo = BeanUtil.copyProperties(updateReqVO, ApplicationInfo.class);
+        infoMapper.updateById(applicationInfo);
+    }
+
+    @Override
+    public void deleteApplicationInfo(String id) {
+        validateCommonCostExists(id);
+        infoMapper.deleteById(id);
+    }
+
     private Map<String, Object> createMap(String flowInstanceId, ApplicationInfo entity, String userId) {
         Map<String, Object> map = new HashMap<>();
         map.put("formEntity", entity);
@@ -91,4 +109,9 @@ public class ApplicationInfoServiceImpl implements IApplicationInfoService {
         return map;
     }
 
+    private void validateCommonCostExists(String id) {
+        if (infoMapper.selectById(id) == null) {
+            throw exception(APPLICATION_INFO_NOT_EXISTS);
+        }
+    }
 }

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/applicationinfo/vo/ApplicationInfoVO.java

@@ -0,0 +1,111 @@
+package com.zjugis.module.business.flow.applicationinfo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author: Fuwb
+ * @date: 2025/3/4
+ * @time: 16:54
+ * @description:
+ */
+@Data
+public class ApplicationInfoVO implements Serializable {
+    private static final long serialVersionUID = 6964929047606625248L;
+
+    private String id;
+
+    /**
+     * 与采购申请流程关联的工作流ID
+     */
+    private String instanceId;
+
+    /**
+     * 受理编号
+     */
+    private String receiveNumber;
+
+    /**
+     * 受理时间
+     */
+    private LocalDateTime receiveTime;
+
+    /**
+     * 来源
+     */
+    private String source;
+
+    /**
+     * 申请内容
+     */
+    private String applicationContent;
+
+    /**
+     * 申请人
+     */
+    private String applicant;
+
+    /**
+     * 身份证号码
+     */
+    private String idNumber;
+
+    /**
+     * 申请时间
+     */
+    private LocalDateTime applicationTime;
+
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+
+    /**
+     * 联系地址
+     */
+    private String contactAddress;
+
+    /**
+     * 领取方式
+     */
+    private String pickupMethod;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 预警时间
+     */
+    private LocalDateTime warningTime;
+
+    /**
+     * 要求办结时间
+     */
+    private LocalDateTime requiredCompleteTime;
+
+    /**
+     * 录入人员
+     */
+    private String inputPerson;
+
+    /**
+     * 录入时间
+     */
+    private LocalDateTime inputTime;
+
+    /**
+     * 流程状态
+     */
+    private Integer flowStatus;
+
+    /**
+     * 流程结束时间
+     */
+    private LocalDateTime flowFinishtime;
+}

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/procurement/vo/ProcurementVO.java

@@ -19,7 +19,7 @@ public class ProcurementVO implements Serializable {
     private static final long serialVersionUID = 6369734601247189039L;
 
     /**
-     * 采购申请的唯一标识编号，自增生成
+     * 采购申请的唯一标识编号
      */
     private Long applicationId;
 

zjugis-module-business/zjugis-module-business-biz/src/main/resources/application-dev.yaml

@@ -43,9 +43,9 @@ spring:
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
           #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
-          url: jdbc:postgresql://60.191.110.205:15432/ruian_oa # Oracle 连接的示例
+          url: jdbc:postgresql://60.191.110.205:15432/ruian_oa?currentSchema=ruian_oa # Oracle 连接的示例
           #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
-          username: ruian_oa
+          username: postgres
           password: zdww1402!
         #          username: sa
         #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/ApplicationInfo/index.ftl

@@ -76,7 +76,6 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                             </td>
                             <td>
                                 <div class="z-form-row">
-                                    <div class="z-form-label z-col-15">文本框</div>
                                     <div class="z-form-control z-col-85 z-form-table">
                                         <div class="z-comp-textarea" name="createReqVO$applicationContent">
                                             <textarea></textarea>
@@ -110,15 +109,13 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                     </div>
                                 </div>
                             </td>
-                        </tr>
-                        <tr>
                             <td class="th">
                                 <div class="form-label">申请时间：</div>
                             </td>
                             <td colspan="3">
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-input" name="createReqVO$applicationTime">
+                                        <div class="z-comp-date" name="createReqVO$applicationTime">
                                             <input type="text" value="${(formEntity.applicationTime?date)!}">
                                         </div>
                                     </div>
@@ -138,8 +135,6 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                     </div>
                                 </div>
                             </td>
-                        </tr>
-                        <tr>
                             <td class="th">
                                 <div class="form-label">联系地址：</div>
                             </td>
@@ -182,6 +177,56 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                 </div>
                             </td>
                         </tr>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">预警时间：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-date" name="createReqVO$warningTime">
+                                            <input type="text" value="${(formEntity.warningTime?date)!}">
+                                        </div>
+                                    </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-date" name="createReqVO$requiredCompleteTime">
+                                            <input type="text" value="${(formEntity.requiredCompleteTime?date)!}">
+                                        </div>
+                                    </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-input z-readonly" name="createReqVO$inputPerson">
+                                            <input type="text" value="${formEntity.inputPerson!}">
+                                        </div>
+                                    </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-input z-readonly" name="createReqVO$inputTime">
+                                            <input type="text" value="${(formEntity.inputTime?date)!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
                     </table>
                 </div>
             </div>