Merge branch 'refs/heads/dev' into test

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/DeleteStatusEnum.java

@@ -7,7 +7,8 @@ public enum DeleteStatusEnum {
 
     STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{add(TmplStsEnum.DRAFT.getCode());}}),
     STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()),
-    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>(){{add(TmplStsEnum.STOPPED.getCode());}});
+    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>(){{add(TmplStsEnum.STOPPED.getCode());}}),
+    STATUS_START(TmplStsEnum.START.getCode(), new HashSet<>());
 
 
     private final String code;

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/PublishStatusEnum.java

@@ -10,7 +10,8 @@ public enum PublishStatusEnum {
 
     STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{add(TmplStsEnum.DRAFT.getCode());}}),
     STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()),
-    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>() );
+    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>() ),
+    STATUS_START(TmplStsEnum.START.getCode(), new HashSet<>() {{add(TmplStsEnum.START.getCode());}});
 
 
     private final String code;

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/TmplStsEnum.java

@@ -9,7 +9,8 @@ public enum TmplStsEnum {
     // 已发布状态
     PUBLISHED("PUB", "已发布"),
     // 已停用状态
-    STOPPED("STOP", "已停用");
+    STOPPED("STOP", "已停用"),
+    START("START", "已启用");
 
     // 获取状态编码
     private final String code;

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/UpdateStatusEnum.java

@@ -10,10 +10,11 @@ public enum UpdateStatusEnum {
         add(TmplStsEnum.STOPPED.getCode());
     }}),
     STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()),
-    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>(){{
+    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>() {{
         add(TmplStsEnum.DRAFT.getCode());
         add(TmplStsEnum.STOPPED.getCode());
-    }});
+    }}),
+    STATUS_START(TmplStsEnum.START.getCode(), new HashSet<>());
 
 
     private final String code;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java

@@ -75,4 +75,9 @@ public class TemplateInstanceRespVO {
     @ExcelProperty("模版分类名称")
     private String tpName;
 
+
+    @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建人")
+    private String creator;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java

@@ -224,6 +224,9 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
             boolean transitionAllowed = false;
             if (status != null) {
                 transitionAllowed = status.isTransitionAllowed(TmplStsEnum.DRAFT.getCode());
+                if (!transitionAllowed){
+                    transitionAllowed = status.isTransitionAllowed(TmplStsEnum.START.getCode());
+                }
             }
             if (!transitionAllowed) {
                 throw exception(STATUS_OPERATION_FAIL);
@@ -253,7 +256,7 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
             code = TmplStsEnum.STOPPED.getCode();
         } else if (reqVO.getType().equals("enable")) {
             // 启用
-            code = TmplStsEnum.PUBLISHED.getCode();
+            code = TmplStsEnum.START.getCode();
         }
         if (code.isEmpty()) {
             throw exception(ILLEGAL_OPERATION_TYPE);
@@ -269,8 +272,14 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
     public TemplateInstanceRespVO createVersion(String id) {
         validateTemplateInstanceExists(Long.valueOf(id));
         TemplateInstanceDO templateInstanceDO = templateInstanceMapper.selectById(id);
+        //如果当前状态不是草稿或者是已启用则不能创建新版本
+        log.info("当前状态【{}】", templateInstanceDO.getSts());
+        if (!TmplStsEnum.DRAFT.getCode().equals(templateInstanceDO.getSts()) && !TmplStsEnum.START.getCode().equals(templateInstanceDO.getSts())) {
+            throw exception(STATUS_OPERATION_FAIL);
+        }
         TemplateInstanceDO newTpInstanceDO = BeanUtils.toBean(templateInstanceDO, TemplateInstanceDO.class);
         newTpInstanceDO.setId(null);
+        newTpInstanceDO.setTenantId(templateInstanceDO.getTenantId());
         newTpInstanceDO.setVer(incrementVersion(templateInstanceDO.getVer()));
         newTpInstanceDO.setPublishTime(LocalDateTime.now());
         newTpInstanceDO.setOrigCntt(templateInstanceDO.getCntt()!=null?templateInstanceDO.getCntt():templateInstanceDO.getOrigCntt());//模板实例内容,默认为上一个版本的当前文件内容

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErrorCodeConstants.java

@@ -19,4 +19,5 @@ public interface ErrorCodeConstants {
     ErrorCode CONTRACT_ID_NOT_EXISTS = new ErrorCode(1_027_000_004, "合同主键为空");
     ErrorCode CONTRACT_STATUS_NOT_UPDATE = new ErrorCode(1_027_000_005, "{}合同不允许修改");
     ErrorCode CONTRACT_DATA_NOT_EXISTS = new ErrorCode(1_027_000_006, "{}不存在");
+    ErrorCode CONTRACT_STATUS_NOT_SUBMIT_APPROVAL = new ErrorCode(1_027_000_005, "{}合同不允许提交审核");
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.contractorder.controller.admin.contract;
 
+import cn.hutool.json.JSONObject;
 import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageResult;
@@ -43,9 +44,9 @@ public class ContractController implements BusinessControllerMarker {
     @PostMapping("/create")
     @Operation(summary = "新增合同")
     @PreAuthorize("@ss.hasPermission('system:contract:create')")
-    public CommonResult<Long> create(@Valid @RequestBody ContractSaveReqVO reqVO) {
+    public CommonResult<JSONObject> create(@Valid @RequestBody ContractSaveReqVO reqVO) {
         Long id = contractService.createContract(reqVO);
-        return success(id);
+        return success(new JSONObject().putOnce("id", id));
     }
 
     @GetMapping("/get")
@@ -101,7 +102,6 @@ public class ContractController implements BusinessControllerMarker {
     public void archive() {
     }
 
-    // TODO
     @GetMapping("/submit/approval")
     @Operation(summary = "合同提交审批")
     @PreAuthorize("@ss.hasPermission('system:contract:approval')")

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPageReqVO.java

@@ -20,6 +20,9 @@ public class ContractPageReqVO extends PageParam {
     @Schema(description = "合同编号;与ERP(HTBH)对应，校验唯一")
     private String contractPaperNumber;
 
+    @Schema(description = "状态", example = "DRAFT")
+    private String status;
+
     @Schema(description = "甲方公司名称", example = "王五")
     private String purchaseCompanyName;