zhangjq 1 рік тому
батько
коміт
f8237e03a9

+ 3 - 5
zjugis-business/src/main/java/com/zjugis/business/converter/officialSeal/OfficialSealConvert.java

@@ -1,9 +1,8 @@
 package com.zjugis.business.converter.officialSeal;
 
 
-import com.zjugis.business.flow.officialSeal.entity.OfficialSealDO;
-import com.zjugis.business.flow.officialSeal.vo.OfficialSealUpdateReqVO;
-import com.zjugis.business.flow.officialSeal.vo.OfficialSealVO;import org.mapstruct.Mapper;
+import com.zjugis.business.flow.officialSeal.entity.OfficialSealUseDO;
+import com.zjugis.business.flow.officialSeal.vo.OfficialSealUseVO;import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
 /**
@@ -16,7 +15,6 @@ public interface OfficialSealConvert {
     OfficialSealConvert INSTANCE = Mappers.getMapper(OfficialSealConvert.class);
 
 
-    OfficialSealDO convert(OfficialSealVO reqVO);
+    OfficialSealUseDO convert(OfficialSealUseVO reqVO);
 
-    OfficialSealUpdateReqVO convert(OfficialSealDO entity);
 }

+ 13 - 14
zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/controller/OfficialSealController.java → zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/controller/OfficialSeaUseController.java

@@ -1,8 +1,8 @@
 package com.zjugis.business.flow.officialSeal.controller;
 
 
-import com.zjugis.business.flow.officialSeal.service.OfficialSealService;
-import com.zjugis.business.flow.officialSeal.vo.OfficialSealVO;
+import com.zjugis.business.flow.officialSeal.service.OfficialSealUseService;
+import com.zjugis.business.flow.officialSeal.vo.OfficialSealUseVO;
 
 import com.zjugis.framework.workflow.model.BaseController;
 import com.zjugis.framework.workflow.workflow.WorkFlow;
@@ -13,22 +13,21 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 行政办公-公章管理
+ * 行政办公-用章申请
  * @Author:zjq
  * @Date:2024-02-27
  */
-@Tag(name = "行政办公-公章管理")
+@Tag(name = "行政办公-用章申请")
 @RestController
-@RequestMapping("/officialSeal")
+@RequestMapping("/officialSealUse")
 @Validated
-public class OfficialSealController  extends BaseController{
+public class OfficialSeaUseController extends BaseController{
 
     @Resource
-    private OfficialSealService officialSealService;
+    private OfficialSealUseService officialSealUseService;
 
 
     /**
@@ -42,7 +41,7 @@ public class OfficialSealController  extends BaseController{
     @WorkFlow(isReceiveMaterial = true, isReceiveOpinion = true)
     @GetMapping("/apply")
     public String apply(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
-        Map<String, Object> map = officialSealService.getFormParams(flowInstanceId, userId);
+        Map<String, Object> map = officialSealUseService.getFormParams(flowInstanceId, userId);
         return resultPage(map);
     }
 
@@ -53,8 +52,8 @@ public class OfficialSealController  extends BaseController{
      * @return
      */
     @PostMapping("/create")
-    public String createOfficialSeal(@Valid @RequestBody OfficialSealVO createReqVO) {
-        return success(officialSealService.createOfficialSeal(createReqVO));
+    public String createOfficialSeal(@Valid @RequestBody OfficialSealUseVO createReqVO) {
+        return success(officialSealUseService.createOfficialSeal(createReqVO));
     }
 
     /**
@@ -63,8 +62,8 @@ public class OfficialSealController  extends BaseController{
      * @return
      */
     @PostMapping("/update")
-    public String updateOfficialSeal(@Valid @RequestBody OfficialSealVO updateReqVO) {
-        officialSealService.updateOfficialSeal(updateReqVO);
+    public String updateOfficialSeal(@Valid @RequestBody OfficialSealUseVO updateReqVO) {
+        officialSealUseService.updateOfficialSeal(updateReqVO);
         return success(true);
     }
 
@@ -76,7 +75,7 @@ public class OfficialSealController  extends BaseController{
     @DeleteMapping("/delete")
     @Parameter(name = "id", description = "编号", required = true)
     public String deleteOfficialSeal(@RequestParam("id") String id) {
-        officialSealService.deleteOfficialSeal(id);
+        officialSealUseService.deleteOfficialSeal(id);
         return success(true);
     }
 }

+ 80 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/controller/OfficialSealOuterController.java

@@ -0,0 +1,80 @@
+package com.zjugis.business.flow.officialSeal.controller;
+
+
+import com.zjugis.business.flow.officialSeal.service.OfficialSealUseService;
+import com.zjugis.business.flow.officialSeal.vo.OfficialSealUseVO;
+import com.zjugis.framework.workflow.model.BaseController;
+import com.zjugis.framework.workflow.workflow.WorkFlow;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * 行政办公-外带申请
+ * @Author:zjq
+ * @Date:2024-02-27
+ */
+@Tag(name = "行政办公-外带申请")
+@RestController
+@RequestMapping("/officialSealOuter")
+@Validated
+public class OfficialSealOuterController extends BaseController{
+
+    @Resource
+    private OfficialSealUseService officialSealUseService;
+
+
+    /**
+     * 获取流程表单
+     * @param activityTemplateId
+     * @param flowInstanceId
+     * @param userId
+     * @return
+     * @throws Exception
+     */
+    @WorkFlow(isReceiveMaterial = true, isReceiveOpinion = true)
+    @GetMapping("/apply")
+    public String apply(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
+        Map<String, Object> map = officialSealUseService.getFormParams(flowInstanceId, userId);
+        return resultPage(map);
+    }
+
+
+    /**
+     * 创建公章申请流程
+     * @param createReqVO
+     * @return
+     */
+    @PostMapping("/create")
+    public String createOfficialSeal(@Valid @RequestBody OfficialSealUseVO createReqVO) {
+        return success(officialSealUseService.createOfficialSeal(createReqVO));
+    }
+
+    /**
+     * 更新公章申请流程
+     * @param updateReqVO
+     * @return
+     */
+    @PostMapping("/update")
+    public String updateOfficialSeal(@Valid @RequestBody OfficialSealUseVO updateReqVO) {
+        officialSealUseService.updateOfficialSeal(updateReqVO);
+        return success(true);
+    }
+
+    /**
+     * 删除公章申请流程
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/delete")
+    @Parameter(name = "id", description = "编号", required = true)
+    public String deleteOfficialSeal(@RequestParam("id") String id) {
+        officialSealUseService.deleteOfficialSeal(id);
+        return success(true);
+    }
+}

+ 4 - 4
zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/dao/OfficialSealDao.java → zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/dao/OfficialSealUseDao.java

@@ -1,6 +1,6 @@
 package com.zjugis.business.flow.officialSeal.dao;
 
-import com.zjugis.business.flow.officialSeal.entity.OfficialSealDO;
+import com.zjugis.business.flow.officialSeal.entity.OfficialSealUseDO;
 import com.zjugis.framework.mybatis.core.mapper.BaseMapperX;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,8 +14,8 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2024-02-27
  */
 @Mapper
-public interface OfficialSealDao extends  BaseMapperX<OfficialSealDO> {
-    default OfficialSealDO findByInstanceId(String flowInstanceId) {
-        return selectOne(new LambdaQueryWrapperX<OfficialSealDO>().eqIfPresent(OfficialSealDO::getInstanceId, flowInstanceId));
+public interface OfficialSealUseDao extends  BaseMapperX<OfficialSealUseDO> {
+    default OfficialSealUseDO findByInstanceId(String flowInstanceId) {
+        return selectOne(new LambdaQueryWrapperX<OfficialSealUseDO>().eqIfPresent(OfficialSealUseDO::getInstanceId, flowInstanceId));
     }
 }

+ 20 - 45
zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/entity/OfficialSealDO.java → zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/entity/OfficialSealUseDO.java

@@ -12,18 +12,16 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
- * <p>
- * 
- * </p>
  *
+ * 用章申请
  * @author zjq
  * @since 2024-02-27
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("WF_OFFICIAL_SEAL")
-public class OfficialSealDO implements Serializable {
+@TableName("WF_OFFICIAL_SEAL_USE")
+public class OfficialSealUseDO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,35 +61,30 @@ public class OfficialSealDO implements Serializable {
     @TableField("DEPT_ID")
     private String deptId;
 
-    /**
-     * 用户名称
-     */
-    @TableField("USER_NICKNAME")
-    private String userNickname;
-
-    /**
-     * 部门名称
-     */
-    @TableField("DEPT_NAME")
-    private String deptName;
+//    /**
+//     * 用户名称
+//     */
+//    @TableField("USER_NICKNAME")
+//    private String userNickname;
+//
+//    /**
+//     * 部门名称
+//     */
+//    @TableField("DEPT_NAME")
+//    private String deptName;
 
     /**
      * 公章申请单号
      */
-    @TableField("OFFICIAL_SEAL_NO")
-    private String officialSealNo;
+    @TableField("OFFICIAL_SEAL_APPLY_NO")
+    private String officialSealApplyNo;
 
     /**
      * 用章类型(字典表)
      */
-    @TableField("OFFICIAL_SEAL_TYPE")
-    private Integer officialSealType;
+    @TableField("OFFICIAL_SEAL_USE_TYPE")
+    private Integer officialSealUseType;
 
-    /**
-     * 用章形式(字典表)
-     */
-    @TableField("OFFICIAL_SEAL_WAY")
-    private Integer officialSealWay;
 
     /**
      * 公章名称(字典表)
@@ -102,26 +95,8 @@ public class OfficialSealDO implements Serializable {
     /**
      * 申请事由
      */
-    @TableField("OFFICIAL_SEAL_REASON")
-    private String officialSealReason;
-
-    /**
-     * 盖章个数
-     */
-    @TableField("OFFICIAL_SEAL_COUNT")
-    private Integer officialSealCount;
-
-    /**
-     * 备注1
-     */
-    @TableField("BZ1")
-    private String bz1;
-
-    /**
-     * 备注2
-     */
-    @TableField("BZ2")
-    private String bz2;
+    @TableField("OFFICIAL_SEAL_APPLY_REASON")
+    private String officialSealApplyReason;
 
     /**
      * 创建人

+ 6 - 6
zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/service/OfficialSealService.java → zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/service/OfficialSealUseService.java

@@ -1,8 +1,8 @@
 package com.zjugis.business.flow.officialSeal.service;
 
 
-import com.zjugis.business.flow.officialSeal.entity.OfficialSealDO;
-import com.zjugis.business.flow.officialSeal.vo.OfficialSealVO;
+import com.zjugis.business.flow.officialSeal.entity.OfficialSealUseDO;
+import com.zjugis.business.flow.officialSeal.vo.OfficialSealUseVO;
 
 import java.util.Map;
 
@@ -10,19 +10,19 @@ import java.util.Map;
  * @Author:zjq
  * @Date:2024-02-27
  */
-public interface OfficialSealService {
+public interface OfficialSealUseService {
     /**
      * 创建用章申请
      * @param createReqVO
      * @return
      */
-    String createOfficialSeal(OfficialSealVO createReqVO);
+    String createOfficialSeal(OfficialSealUseVO createReqVO);
 
     /**
      * 更新用章申请流程
      * @param updateReqVO
      */
-    void updateOfficialSeal(OfficialSealVO updateReqVO);
+    void updateOfficialSeal(OfficialSealUseVO updateReqVO);
 
     /**
      * 删除用章申请流程
@@ -35,7 +35,7 @@ public interface OfficialSealService {
      * @param flowInstanceId
      * @return
      */
-    OfficialSealDO findByInstanceId(String flowInstanceId);
+    OfficialSealUseDO findByInstanceId(String flowInstanceId);
 
     /**
      * 获取表单参数

+ 22 - 30
zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/service/OfficialSealServiceImpl.java → zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/service/OfficialSealUseServiceImpl.java

@@ -8,9 +8,9 @@ import com.zjugis.business.converter.common.SelectConvert;
 
 import com.zjugis.business.converter.officialSeal.OfficialSealConvert;
 
-import com.zjugis.business.flow.officialSeal.dao.OfficialSealDao;
-import com.zjugis.business.flow.officialSeal.entity.OfficialSealDO;
-import com.zjugis.business.flow.officialSeal.vo.OfficialSealVO;
+import com.zjugis.business.flow.officialSeal.dao.OfficialSealUseDao;
+import com.zjugis.business.flow.officialSeal.entity.OfficialSealUseDO;
+import com.zjugis.business.flow.officialSeal.vo.OfficialSealUseVO;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
@@ -34,32 +34,32 @@ import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.ex
  * @Date:2024-02-27
  */
 @Service
-public class OfficialSealServiceImpl implements OfficialSealService{
+public class OfficialSealUseServiceImpl implements OfficialSealUseService {
     @Resource
     private WorkflowClient workflowClient;
     @Resource
-    private OfficialSealDao officialSealDao;
+    private OfficialSealUseDao officialSealUseDao;
 
     @Resource
     private DictDataApi dictDataApi;
 
     @Override
-    public String createOfficialSeal(OfficialSealVO createReqVO) {
+    public String createOfficialSeal(OfficialSealUseVO createReqVO) {
         // 插入
-        OfficialSealDO officialSeal = OfficialSealConvert.INSTANCE.convert(createReqVO);
-        officialSealDao.insert(officialSeal);
+        OfficialSealUseDO officialSeal = OfficialSealConvert.INSTANCE.convert(createReqVO);
+        officialSealUseDao.insert(officialSeal);
 
         // 返回
         return officialSeal.getId();
     }
 
     @Override
-    public void updateOfficialSeal(OfficialSealVO updateReqVO) {
+    public void updateOfficialSeal(OfficialSealUseVO updateReqVO) {
         // 校验存在
         validateOfficialSealExists(updateReqVO.getId());
         // 更新
-        OfficialSealDO updateObj = (OfficialSealConvert.INSTANCE.convert(updateReqVO));
-        officialSealDao.updateById(updateObj);
+        OfficialSealUseDO updateObj = (OfficialSealConvert.INSTANCE.convert(updateReqVO));
+        officialSealUseDao.updateById(updateObj);
     }
 
     @Override
@@ -67,12 +67,12 @@ public class OfficialSealServiceImpl implements OfficialSealService{
         // 校验存在
         validateOfficialSealExists(id);
         //删除
-        officialSealDao.deleteById(id);
+        officialSealUseDao.deleteById(id);
     }
 
     @Override
-    public OfficialSealDO findByInstanceId(String flowInstanceId) {
-        return officialSealDao.findByInstanceId(flowInstanceId);
+    public OfficialSealUseDO findByInstanceId(String flowInstanceId) {
+        return officialSealUseDao.findByInstanceId(flowInstanceId);
     }
 
     @Override
@@ -83,12 +83,12 @@ public class OfficialSealServiceImpl implements OfficialSealService{
         CommonResult<IFlowInstance> flowResult = workflowClient.flowInstance(flowInstanceId);
         if (flowResult.isSuccess()) {
             IFlowInstance flowInstance = flowResult.getData();
-            OfficialSealDO entity = findByInstanceId(flowInstanceId);
+            OfficialSealUseDO entity = findByInstanceId(flowInstanceId);
             if (Objects.isNull(entity)) {
-                entity = new OfficialSealDO();
+                entity = new OfficialSealUseDO();
                 entity.setInstanceId(flowInstanceId);
                 entity.setUserId(userId);
-                entity.setOfficialSealNo(flowInstance.getCode());
+                entity.setOfficialSealApplyNo(flowInstance.getCode());
                 entity.setCreateTime(LocalDateTime.now());
                 entity.setFlowStatus(FlowStatusConstants.FLOW_NOT_START);
 //                CommonResult<AdminUserRespDTO> result = adminUserApi.getUser(userId);
@@ -97,7 +97,7 @@ public class OfficialSealServiceImpl implements OfficialSealService{
 //                    entity.setDeptId(result.getData().getDeptId());
 //                    entity.setDeptName(result.getData().getDeptName());
 //                }
-                officialSealDao.insert(entity);
+                officialSealUseDao.insert(entity);
             }
             return createMap(flowInstanceId, entity, userId);
         }
@@ -107,29 +107,21 @@ public class OfficialSealServiceImpl implements OfficialSealService{
     private Map<String, Object> createModelMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("formEntity", new HashMap<>());
-        List<Select> sealTypeList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_TYPE).getCheckedData());
-        map.put("sealTypeJSON", JSON.toJSONString(sealTypeList));
-        List<Select> sealWayList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_WAY).getCheckedData());
-        map.put("sealWayJSON", JSON.toJSONString(sealWayList));
-        List<Select> sealNameList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_NAME).getCheckedData());
-        map.put("sealNameJSON", JSON.toJSONString(sealNameList));
         return map;
     }
 
-    private Map<String, Object> createMap(String flowInstanceId, OfficialSealDO entity, String userId) {
+    private Map<String, Object> createMap(String flowInstanceId, OfficialSealUseDO entity, String userId) {
         Map<String, Object> map = new HashMap<>();
         map.put("formEntity", entity);
         List<Select> sealTypeList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_TYPE).getCheckedData());
-        map.put("sealTypeJSON", JSON.toJSONString(sealTypeList));
-        List<Select> sealWayList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_WAY).getCheckedData());
-        map.put("sealWayJSON", JSON.toJSONString(sealWayList));
+        map.put("sealTypeList", JSON.toJSONString(sealTypeList));
         List<Select> sealNameList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.WF_SEAL_NAME).getCheckedData());
-        map.put("sealNameJSON", JSON.toJSONString(sealNameList));
+        map.put("sealNameList", JSON.toJSONString(sealNameList));
         return map;
     }
 
     private void validateOfficialSealExists(String id) {
-        if (officialSealDao.selectById(id) == null) {
+        if (officialSealUseDao.selectById(id) == null) {
             throw exception(SEAL_NOT_EXISTS);
         }
     }

+ 0 - 8
zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/vo/OfficialSealUpdateReqVO.java

@@ -1,8 +0,0 @@
-package com.zjugis.business.flow.officialSeal.vo;
-
-/**
- * @Author:zjq
- * @Date:2024-02-27
- */
-public class OfficialSealUpdateReqVO {
-}

+ 82 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/vo/OfficialSealUseVO.java

@@ -0,0 +1,82 @@
+package com.zjugis.business.flow.officialSeal.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author:zjq
+ * @Date:2024-02-27
+ */
+@Data
+public class OfficialSealUseVO {
+
+    /**
+     * 主键ID(新增不传)
+     */
+    private String id;
+
+    /**
+     * 流程实例ID
+     */
+    private String instanceId;
+
+    /**
+     * 流程状态 1已完成 2进行中 3已撤销
+     */
+    private Integer flowStatus;
+
+    /**
+     * 流程完成时间
+     */
+    private LocalDateTime flowFinishtime;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    /**
+     * 用户名称
+     */
+    @TableField("USER_NICKNAME")
+    private String userNickname;
+
+    /**
+     * 部门名称
+     */
+    @TableField("DEPT_NAME")
+    private String deptName;
+
+
+    /**
+     * 公章申请单号
+     */
+
+    private String officialSealApplyNo;
+
+    /**
+     * 用章类型(字典表)
+     */
+    private Integer officialSealUseType;
+
+
+    /**
+     * 公章名称(字典表)
+     */
+    private Integer officialSealName;
+
+    /**
+     * 申请事由
+     */
+    private String officialSealApplyReason;
+
+
+
+}

+ 0 - 99
zjugis-business/src/main/java/com/zjugis/business/flow/officialSeal/vo/OfficialSealVO.java

@@ -1,99 +0,0 @@
-package com.zjugis.business.flow.officialSeal.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * @Author:zjq
- * @Date:2024-02-27
- */
-@Data
-public class OfficialSealVO {
-    /**
-     * 主键ID
-     */
-    @TableId("ID")
-    private String id;
-
-    /**
-     * 流程实例ID
-     */
-    @TableField("INSTANCE_ID")
-    private String instanceId;
-
-    /**
-     * 流程状态 1已完成 2进行中 3已撤销
-     */
-    @TableField("FLOW_STATUS")
-    private Integer flowStatus;
-
-    /**
-     * 流程完成时间
-     */
-    @TableField("FLOW_FINISHTIME")
-    private LocalDateTime flowFinishtime;
-
-    /**
-     * 用户ID
-     */
-    @TableField("USER_ID")
-    private String userId;
-
-    /**
-     * 部门ID
-     */
-    @TableField("DEPT_ID")
-    private String deptId;
-
-//    /**
-//     * 用户名称
-//     */
-//    @TableField("USER_NICKNAME")
-//    private String userNickname;
-//
-//    /**
-//     * 部门名称
-//     */
-//    @TableField("DEPT_NAME")
-//    private String deptName;
-
-    /**
-     * 公章申请单号
-     */
-    @TableField("OFFICIAL_SEAL_NO")
-    private String officialSealNo;
-
-    /**
-     * 用章类型(字典表)
-     */
-    @TableField("OFFICIAL_SEAL_TYPE")
-    private Integer officialSealType;
-
-    /**
-     * 用章形式(字典表)
-     */
-    @TableField("OFFICIAL_SEAL_WAY")
-    private Integer officialSealWay;
-
-    /**
-     * 公章名称(字典表)
-     */
-    @TableField("OFFICIAL_SEAL_NAME")
-    private Integer officialSealName;
-
-    /**
-     * 申请事由
-     */
-    @TableField("OFFICIAL_SEAL_REASON")
-    private String officialSealReason;
-
-    /**
-     * 盖章个数
-     */
-    @TableField("OFFICIAL_SEAL_COUNT")
-    private Integer officialSealCount;
-
-}

+ 158 - 0
zjugis-business/src/main/resources/templates/OfficialSealUse/index.ftl

@@ -0,0 +1,158 @@
+<@w.workFlow javascripts=['/LoanFlow/js/index.js','/CommonCost/js/money.js','/flow/js/formCommon.js','/js/moment.js', '/OwCommon/OwCommon.js']
+  styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon/OwCommon.css' ]>
+  <div class="z-position form-boss ow-tabs" name="createReqVO">
+    <div class="z-form-row" style="display: none;">
+      <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
+      <input type="text" value="${formEntity.id!}" name="createReqVO$id">
+    </div>
+    <ul class="ow-tab-nav oa_tabBox">
+      <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+      <#if WORKFLOW.OPINION! !="">
+        <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+      </#if>
+    </ul>
+    <div class="ow-tab-scroll">
+      <div class="ow-tab-content" name="jbxx">
+      <div class="form-title" style="margin-top: 0px;">
+        <div class="form-icon">
+          <img src="/imgs/titleIcon.png" alt="">
+          <span>基本信息</span>
+        </div>
+        <div class="form-btn">
+        </div>
+      </div>
+      <div class="jbxx-box jbxx-box-flex">
+        <table class="jbxx-table-info">
+          <tr>
+            <td class="th">
+              <div class="form-label">申请人:</div>
+            </td>
+            <td>
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="z-comp-input" name="createReqVO$userNickname">
+                    <input type="text" value="${formEntity.userNickname!}">
+                  </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" name="createReqVO$deptName">
+                    <input type="text" value="${formEntity.deptName!}">
+                  </div>
+                </div>
+              </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 z-readonly" name="createReqVO$createTime">
+                    <input type="text" value="${(formEntity.createTime?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" name="createReqVO$officialSealApplyNo">
+                    <input type="text" value="${formEntity.officialSealApplyNo!}">
+                  </div>
+                </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="contract$officialSealApplyReason">
+                    <input type="text" value="${formEntity.officialSealApplyReason!}">
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td class="th">
+              <div class="form-label">用章类型:</div>
+            </td>
+            <td>
+              <div class="form-group">
+                <div class="form-item">
+                  <div class="form-item">
+                    <div class="z-comp-select" name="contract$officialSealUseType"
+                         data='${sealTypeList!}' value="${formEntity.officialSealUseType!}">
+                      <div class="z-inputselect-bar">
+                        <span> ${officialSealUseType!} </span><i></i>
+                      </div>
+                    </div>
+                  </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-select" name="contract$secondType"
+                       data='${sealNameList!}' value="${formEntity.officialSealName!}">
+                    <div class="z-inputselect-bar">
+                      <span> ${officialSealName!} </span><i></i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </td>
+          </tr>
+        </table>
+      </div>
+      </div>
+    </div>
+    <div class="ow-tab-content" name="yj">
+      <#if WORKFLOW.OPINION! !="">
+        <div class="form-title">
+          <div class="form-icon">
+            <img src="/imgs/titleIcon.png" alt="">
+            <span>审批意见</span>
+          </div>
+          <div class="form-btn">
+          </div>
+        </div>
+        <div class="qjsjxx-box">
+          <div class="z-form-wrap" name="opinionsDiv">
+            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+          </div>
+        </div>
+      </#if>
+    </div>
+  </div>
+  <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
+  <script language="javascript">
+  ;
+  (function() {})();
+  </script>
+  <style type="text/css">
+    .qjsjxx-box .form-table-info tr:nth-child(1){
+      height: 63px;
+    }
+  </style>
+</@w.workFlow>

+ 32 - 0
zjugis-business/src/main/resources/templates/OfficialSealUse/js/index.js

@@ -0,0 +1,32 @@
+(function () {
+    let flowInstanceId = "";
+    window.onload = function () {
+        flowInstanceId = z.ui.comm.getUrlParam("flowInstanceId");
+        bindEvents();
+    };
+
+    function bindEvents() {
+        z.workflow.saveBtn.addListener("onSaveClick", submit);
+    }
+
+    function submit(all, istransfer) {
+        var postData = z.ui.form.getFormFields("[name=flow-form]", { validatorRequired: istransfer });
+        if (postData === false) {
+            all({ success: false });
+            return;
+        }
+        z.ui.ajax({
+            url: z.ui.comm.getEntranceUrl("/officialSealUse/update"),
+            data: z.ui.form.childStringify(postData),
+            success: function () {
+                all({ success: true });
+            },
+            error: function () {
+                all({ success: false });
+            }
+        })
+    }
+
+}());
+
+