1、修改bug

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

@@ -39,9 +39,9 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 
 @Tag(name = "管理后台 - 部门与实例关联")
 @RestController
-@RequestMapping("/bse/department-instance-relativity")
+@RequestMapping("/base/department-instance-relativity")
 @Validated
-@FileUploadController(source = "bse.departmentinstancerelativity")
+@FileUploadController(source = "base.departmentinstancerelativity")
 public class DepartmentInstanceRelativityController extends AbstractFileUploadController implements BusinessControllerMarker{
 
     static {
@@ -56,14 +56,14 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
 
     @PostMapping("/create")
     @Operation(summary = "创建部门与实例关联")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:create')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:create')")
     public CommonResult<DepartmentInstanceRelativityRespVO> createDepartmentInstanceRelativity(@Valid @RequestBody DepartmentInstanceRelativitySaveReqVO createReqVO) {
         return success(departmentInstanceRelativityService.createDepartmentInstanceRelativity(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新部门与实例关联")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:update')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:update')")
     public CommonResult<Boolean> updateDepartmentInstanceRelativity(@Valid @RequestBody DepartmentInstanceRelativitySaveReqVO updateReqVO) {
         departmentInstanceRelativityService.updateDepartmentInstanceRelativity(updateReqVO);
         return success(true);
@@ -72,7 +72,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
     @DeleteMapping("/delete")
     @Operation(summary = "删除部门与实例关联")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:delete')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:delete')")
     public CommonResult<Boolean> deleteDepartmentInstanceRelativity(@RequestParam("id") String id) {
         departmentInstanceRelativityService.deleteDepartmentInstanceRelativity(id);
         return success(true);
@@ -81,7 +81,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除部门与实例关联")
-                @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:delete')")
+                @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:delete')")
     public CommonResult<Boolean> deleteDepartmentInstanceRelativityList(@RequestBody BatchDeleteReqVO req) {
         departmentInstanceRelativityService.deleteDepartmentInstanceRelativityListByIds(req.getIds());
         return success(true);
@@ -90,7 +90,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
     @GetMapping("/get")
     @Operation(summary = "获得部门与实例关联")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:query')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:query')")
     public CommonResult<DepartmentInstanceRelativityRespVO> getDepartmentInstanceRelativity(@RequestParam("id") String id) {
         DepartmentInstanceRelativityDO departmentInstanceRelativity = departmentInstanceRelativityService.getDepartmentInstanceRelativity(id);
         return success(BeanUtils.toBean(departmentInstanceRelativity, DepartmentInstanceRelativityRespVO.class));
@@ -98,7 +98,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
 
     @GetMapping("/page")
     @Operation(summary = "获得部门与实例关联分页")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:query')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:query')")
     public CommonResult<PageResult<DepartmentInstanceRelativityRespVO>> getDepartmentInstanceRelativityPage(@Valid DepartmentInstanceRelativityPageReqVO pageReqVO) {
         PageResult<DepartmentInstanceRelativityDO> pageResult = departmentInstanceRelativityService.getDepartmentInstanceRelativityPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, DepartmentInstanceRelativityRespVO.class));
@@ -106,7 +106,7 @@ public class DepartmentInstanceRelativityController extends AbstractFileUploadCo
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出部门与实例关联 Excel")
-    @PreAuthorize("@ss.hasPermission('bse:department-instance-relativity:export')")
+    @PreAuthorize("@ss.hasPermission('base:department-instance-relativity:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportDepartmentInstanceRelativityExcel(@Valid DepartmentInstanceRelativityPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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

@@ -48,7 +48,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
 @RestController
 @RequestMapping("/base/template-instance")
 @Validated
-@FileUploadController(source = "bse.templateinstance")
+@FileUploadController(source = "base.templateinstance")
 public class TemplateInstanceController extends AbstractFileUploadController {
 
     static {
@@ -70,14 +70,14 @@ public class TemplateInstanceController extends AbstractFileUploadController {
 
     @PostMapping("/create")
     @Operation(summary = "创建模板实例")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:create')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:create')")
     public CommonResult<TemplateInstanceRespVO> createTemplateInstance(@Valid @RequestBody TemplateInstanceSaveReqVO createReqVO) {
         return success(templateInstanceService.createTemplateInstance(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模板实例")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:update')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:update')")
     public CommonResult<Boolean> updateTemplateInstance(@Valid @RequestBody TemplateInstanceSaveReqVO updateReqVO) {
         templateInstanceService.updateTemplateInstance(updateReqVO);
         return success(true);
@@ -86,7 +86,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板实例")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:delete')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:delete')")
     public CommonResult<Boolean> deleteTemplateInstance(@RequestParam("id") Long id) {
         templateInstanceService.deleteTemplateInstance(id);
         return success(true);
@@ -95,7 +95,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除模板实例")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:delete')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:delete')")
     public CommonResult<Boolean> deleteTemplateInstanceList(@RequestBody BatchDeleteReqVO req) {
         templateInstanceService.deleteTemplateInstanceListByIds(req.getIds());
         return success(true);
@@ -104,7 +104,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     @GetMapping("/get")
     @Operation(summary = "获得模板实例")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:query')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<TemplateInstanceRespVO> getTemplateInstance(@Valid @NotEmpty(message = "编号不能为空") @RequestParam("id") String id) {
         TemplateInstanceDO templateInstance = templateInstanceService.getTemplateInstance(Long.valueOf(id));
         TemplateInstanceRespVO templateInstanceRespVO = BeanUtils.toBean(templateInstance, TemplateInstanceRespVO.class);
@@ -119,7 +119,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
 
     @GetMapping("/page")
     @Operation(summary = "获得模板实例分页")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:query')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<PageResult<TemplateInstanceRespVO>> getTemplateInstancePage(@Valid TemplateInstancePageReqVO pageReqVO) {
         PageResult<TemplateInstanceDO> pageResult = templateInstanceService.getTemplateInstancePage(pageReqVO);
         PageResult<TemplateInstanceRespVO> templateInstanceRespVOPageResult = BeanUtils.toBean(pageResult, TemplateInstanceRespVO.class);
@@ -133,7 +133,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出模板实例 Excel")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:export')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportTemplateInstanceExcel(@Valid TemplateInstancePageReqVO pageReqVO,
                                             HttpServletResponse response) throws IOException {
@@ -147,7 +147,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //模版实例发布
     @PostMapping("/publish-batch")
     @Operation(summary = "模版实例发布")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:publish')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:publish')")
     public CommonResult<Boolean> publishTemplateInstance(@Valid @RequestBody List<PublishTemplateInstanceReqVO> publishReqVOS) {
         templateInstanceService.publishTemplateInstance(publishReqVOS);
         return success(true);
@@ -156,7 +156,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //不显示停用状态的查询接口
     @GetMapping("/list-excluding-disabled")
     @Operation(summary = "获得模板实例")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:query')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:query')")
     public CommonResult<PageResult<TemplateInstanceRespVO>> listExcludingDisabled(@Valid TemplateInstancePageReqVO pageReqVO) {
         PageResult<TemplateInstanceRespVO> templateInstanceRespVOPageResult = BeanUtils.toBean(templateInstanceService.listExcludingDisabled(pageReqVO), TemplateInstanceRespVO.class);
         templateInstanceRespVOPageResult.getList().forEach(
@@ -172,7 +172,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //停用和启用接口
     @PostMapping("/disable-enable")
     @Operation(summary = "实例停用和启用接口", description = "实例停用和启用接口")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:disable-enable')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:disable-enable')")
     public CommonResult<Boolean> setDisableOrEnable(@Valid @RequestBody DisableEnableReqVO reqVO) {
         templateInstanceService.setDisableOrEnable(reqVO);
         return success(true);
@@ -188,7 +188,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //创建版本
     @PostMapping("/create-version")
     @Operation(summary = "创建版本")
-    @PreAuthorize("@ss.hasPermission('bse:template-instance:create-version')")
+    @PreAuthorize("@ss.hasPermission('base:template-instance:create-version')")
     public CommonResult<TemplateInstanceRespVO> createVersion(@Valid @NotEmpty(message = "模版实例id不能为空") String id) {
         return success(templateInstanceService.createVersion(id));
     }

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

@@ -10,6 +10,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmpItmPageReqVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmSaveReqVO;
+import com.zt.plat.module.base.controller.admin.templtp.vo.UpdateStsVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplItmDO;
 import com.zt.plat.module.base.service.tmpltp.TmplItmService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,6 +19,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -88,4 +90,13 @@ public class TmplItmController {
         PageResult<TmplItmDO> pageResult = tmplItmService.pageTmplItm(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TmplItmRespVO.class));
     }
+
+
+    @PutMapping("/update-sts")
+    @Operation(summary = "更新模板条款状态")
+    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:update')")
+    public CommonResult<Boolean> updateTmplTpSts(@RequestBody UpdateStsVO updateStsVO) {
+        tmplItmService.updateTmplTpSts(updateStsVO);
+        return success(true);
+    }
 }

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

@@ -43,7 +43,7 @@ import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.PARAMS_IS_NULL_
 @RestController
 @RequestMapping("/base/tmpl-tp")
 @Validated
-@FileUploadController(source = "bse.tmpltp")
+@FileUploadController(source = "base.tmpltp")
 public class TmplTpController extends AbstractFileUploadController implements BusinessControllerMarker{
 
     @Resource
@@ -51,14 +51,14 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
 
     @PostMapping("/create")
     @Operation(summary = "创建模板分类")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:create')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:create')")
     public CommonResult<TmplTpRespVO> createTmplTp(@Valid @RequestBody TmplTpSaveReqVO createReqVO) {
         return success(tmplTpService.createTmplTp(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模板分类")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:update')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
     public CommonResult<Boolean> updateTmplTp(@Valid @RequestBody TmplTpSaveReqVO updateReqVO) {
         tmplTpService.updateTmplTp(updateReqVO);
         return success(true);
@@ -67,7 +67,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板分类")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:delete')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:delete')")
     public CommonResult<Boolean> deleteTmplTp(@RequestBody BatchDeleteReqVO req) {
         tmplTpService.deleteTmplTp(req.getIds());
         return success(true);
@@ -76,7 +76,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除模板分类")
-                @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:delete')")
+                @PreAuthorize("@ss.hasPermission('base:tmpl-tp:delete')")
     public CommonResult<Boolean> deleteTmplTpList(@RequestBody BatchDeleteReqVO req) {
         tmplTpService.deleteTmplTpListByIds(req.getIds());
         return success(true);
@@ -85,7 +85,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     @GetMapping("/get")
     @Operation(summary = "获得模板分类")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:query')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:query')")
     public CommonResult<TmplTpRespVO> getTmplTp(@Valid @NotEmpty(message = "编号不能为空") @RequestParam("id") String id) {
         TmplTpDO tmplTp = tmplTpService.getTmplTp(Long.valueOf(id));
         return success(BeanUtils.toBean(tmplTp, TmplTpRespVO.class));
@@ -93,7 +93,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
 
     @GetMapping("/page")
     @Operation(summary = "获得模板分类分页")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:query')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:query')")
     public CommonResult<PageResult<TmplTpRespVO>> getTmplTpPage(@Valid TmplTpPageReqVO pageReqVO) {
         PageResult<TmplTpDO> pageResult = tmplTpService.getTmplTpPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TmplTpRespVO.class));
@@ -101,7 +101,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出模板分类 Excel")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:export')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportTmplTpExcel(@Valid TmplTpPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
@@ -114,7 +114,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     //字段和条款回显
     @GetMapping("/field-and-clause")
     @Operation(summary = "获得字段和条款",description = "字段和条款回显,传入模版分类的id")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:query')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:query')")
     public CommonResult<Map<String, Object>> getFieldAndClause(@Valid @NotEmpty(message = "编号不能为空")@RequestParam("id") String id) {
         Map<String, Object> map = new HashMap<>();
         map.put("field", tmplTpService.getField(Long.valueOf(id)));
@@ -132,7 +132,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     //更新类型状态
     @PutMapping("/updateStatus")
     @Operation(summary = "更新模板类型状态")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:update')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
     public CommonResult<Boolean> updateStatus(@RequestBody Map<String,Object> params) {
         if (params == null){
             throw exception(PARAMS_IS_NULL_OR_ERR);
@@ -147,7 +147,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     //表单预览
 //    @GetMapping("/preview")
 //    @Operation(summary = "表单预览",description = "传入模版分类的id")
-//    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:query')")
+//    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:query')")
 //    public CommonResult< List<TmplFldRespVO>> preview(@Valid @RequestParam("id") Long id) {
 //        List<TmplFldRespVO> field = tmplTpService.getField(id);
 //        return success(field);
@@ -156,7 +156,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     // 字段编辑新增或者删除
     @PostMapping("/field-edit")
     @Operation(summary = "字段编辑新增或者删除")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:update')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
     public CommonResult<Boolean> fieldEdit(@Valid @RequestBody TmplTpEditOrDeleteReqVO reqVO) {
         tmplTpService.fieldEdit(reqVO);
         return success(true);
@@ -164,7 +164,7 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
 
     @PostMapping("/ltm-edit")
     @Operation(summary = "条款编辑新增或者删除")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:update')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp:update')")
     public CommonResult<Boolean> ltmEdit(@Valid @RequestBody TmplTpEditOrDeleteReqVO reqVO) {
         tmplTpService.ltmEdit(reqVO);
         return success(true);

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

@@ -8,6 +8,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldPageReqVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplTpFldSaveReqVO;
+import com.zt.plat.module.base.controller.admin.templtp.vo.UpdateStsVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpFldDO;
 import com.zt.plat.module.base.service.tmpltp.TmplTpFldService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,42 +28,49 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/base/tmpl-fld")
 @Validated
-@FileUploadController(source = "bse.tmplfld")
+@FileUploadController(source = "base.tmplfld")
 @RequiredArgsConstructor
 public class TmplTpFldController {
     private final TmplTpFldService tmplTpFldService;
     @PostMapping("/create")
     @Operation(summary = "创建模板字段")
-//    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:create')")
+//    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:create')")
     public CommonResult<TmplFldRespVO> createTmplFld(@Valid @RequestBody TmplTpFldSaveReqVO tmplTpFldSaveReqVO) {
         return success(tmplTpFldService.createTmplFld(tmplTpFldSaveReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新模板字段")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:update')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:update')")
     public CommonResult<Boolean> updateTmplTp(@Valid @RequestBody TmplTpFldSaveReqVO updateReqVO) {
         tmplTpFldService.updateTmplFld(updateReqVO);
         return success(true);
     }
     @DeleteMapping("/delete")
     @Operation(summary = "删除模板字段")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:delete')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:delete')")
     public CommonResult<Boolean> deleteTmplTp(@RequestBody BatchDeleteReqVO req) {
         tmplTpFldService.deleteTmplTpByIds(req.getIds());
         return success(true);
     }
     @GetMapping("/page")
     @Operation(summary = "获得模板字段列表")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:list')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:list')")
     public CommonResult<PageResult<TmplFldRespVO>> getTmplTpList( @Valid TmplFldPageReqVO pageReqVO) {
         PageResult<TmplTpFldDO> pageResult = tmplTpFldService.tmplTpFldPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, TmplFldRespVO.class));
     }
     @GetMapping("/class-fld")
     @Operation(summary = "获得类固定模板字段列表", description = "clazz为VO类类名")
-    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp-fld:list')")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:list')")
     public CommonResult<List<Map<String, Object>>> getTmplTpListByClass(String clazz) {
         return success(tmplTpFldService.getTmplTpListByClass(clazz));
     }
+    @PutMapping("/update-sts")
+    @Operation(summary = "更新模板字段状态")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-tp-fld:update')")
+    public CommonResult<Boolean> updateTmplTpSts(@RequestBody UpdateStsVO updateStsVO) {
+        tmplTpFldService.updateTmplTpSts(updateStsVO);
+        return success(true);
+    }
 }

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

@@ -40,4 +40,7 @@ public class TmplFldRespVO {
     @ExcelProperty("是否必填")
     private String isMust;
 
+    @Schema(description = "字段状态", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("字段状态")
+    private String sts;
 }

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

@@ -44,4 +44,9 @@ public class TmplItmRespVO {
     @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建人")
     private String creator;
+
+    @Schema(description = "字段状态", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("字段状态")
+    private String sts;
+
 }

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

@@ -23,4 +23,7 @@ public class TmplItmSaveReqVO {
 
     @Schema(description = "条款值", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
     private String itmVal;
+
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用")
+    private String sts;
 }

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

@@ -22,4 +22,7 @@ public class TmplTpFldSaveReqVO {
     @Schema(description = "是否必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "Y or N")
     private String isMust;
 
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用")
+    private String sts;
+
 }

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

@@ -0,0 +1,20 @@
+package com.zt.plat.module.base.controller.admin.templtp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+@Data
+@Schema(description = "管理后台 - 更新状态 Request VO")
+@Validated
+public class UpdateStsVO {
+    @Schema(description = "ids", requiredMode = Schema.RequiredMode.REQUIRED, example = "['id1','id2']")
+    @NotEmpty(message = "ids为空")
+    private List<String> ids;
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用和禁用或者其他")
+    @NotEmpty(message = "状态为空")
+    private String sts;
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmDO.java

@@ -29,4 +29,7 @@ public class TmplItmDO extends BusinessBaseDO {
     @TableField("ITM_VAL")
     private String itmVal;
 
+    @TableField("STS")
+    private String sts;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpFldDO.java

@@ -73,4 +73,7 @@ public class TmplTpFldDO extends BusinessBaseDO { // 继承业务基类，自动
      */
     @TableField("ORGN_TP")
     private String orgnTp;
+
+    @TableField("STS")
+    private String sts;
 }

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

@@ -5,6 +5,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmpItmPageReqVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmSaveReqVO;
+import com.zt.plat.module.base.controller.admin.templtp.vo.UpdateStsVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplItmDO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.validation.Valid;
@@ -46,4 +47,10 @@ public interface TmplItmService extends IService<TmplItmDO> {
      * @return 模板条目
      */
     List<TmplItmDO> listTmplItmByIds(@Valid @NotEmpty(message = "ids不能为空") List<String> ids);
+    /**
+     * 更新模板条目状态
+     *
+     * @param updateStsVO 更新信息
+     */
+    void updateTmplTpSts(UpdateStsVO updateStsVO);
 }

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

@@ -2,15 +2,19 @@ package com.zt.plat.module.base.service.tmpltp;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.tenant.core.context.CompanyContextHolder;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmpItmPageReqVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmSaveReqVO;
+import com.zt.plat.module.base.controller.admin.templtp.vo.UpdateStsVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplItmDO;
+import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpFldDO;
 import com.zt.plat.module.base.dal.mysql.tmpltp.TmplItmMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -23,6 +27,7 @@ import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.TMPL_ITM_NOT_EX
 
 @Service
 @Validated
+@Slf4j
 public class TmplItmServiceImpl extends ServiceImpl<TmplItmMapper, TmplItmDO> implements TmplItmService{
     @Override
     public TmplItmRespVO createTmplItm(TmplItmSaveReqVO tmplItmSaveReqVO) {
@@ -76,4 +81,10 @@ public class TmplItmServiceImpl extends ServiceImpl<TmplItmMapper, TmplItmDO> im
     public List<TmplItmDO> listTmplItmByIds(List<String> ids) {
         return baseMapper.selectByIds(ids);
     }
+
+    @Override
+    public void updateTmplTpSts(UpdateStsVO updateStsVO) {
+        log.info("更新模板字段状态，参数：【{}】", updateStsVO);
+        baseMapper.update(Wrappers.<TmplItmDO>lambdaUpdate().set(TmplItmDO::getSts, updateStsVO.getSts()).in(TmplItmDO::getId, updateStsVO.getIds()));
+    }
 }

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

@@ -5,6 +5,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldPageReqVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplTpFldSaveReqVO;
+import com.zt.plat.module.base.controller.admin.templtp.vo.UpdateStsVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpFldDO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.validation.Valid;
@@ -51,5 +52,7 @@ public interface TmplTpFldService extends IService<TmplTpFldDO> {
      */
     List<TmplTpFldDO> getTmplTpListByValKeys(List< String> valNames);
 
+    void updateTmplTpSts(UpdateStsVO updateStsVO);
+
 
 }

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

@@ -9,6 +9,7 @@ import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldPageReqVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplTpFldSaveReqVO;
+import com.zt.plat.module.base.controller.admin.templtp.vo.UpdateStsVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpFldDO;
 import com.zt.plat.module.base.dal.mysql.tmpltp.TmplTpFldMapper;
 import com.alibaba.fastjson2.JSONObject;
@@ -38,6 +39,7 @@ public class TmplTpFldServiceImpl extends ServiceImpl<TmplTpFldMapper, TmplTpFld
     public TmplFldRespVO createTmplFld(TmplTpFldSaveReqVO tmplTpFldSaveReqVO) {
         TmplTpFldDO tmplTpFldDO = BeanUtils.toBean(tmplTpFldSaveReqVO, TmplTpFldDO.class);
         validateTmplFldCodeExists(tmplTpFldSaveReqVO.getFldKy());
+        tmplTpFldDO.setSts("启用");
         baseMapper.insert(tmplTpFldDO);
         log.info("创建模板字段成功，模板字段信息：【{}】", tmplTpFldDO);
         return BeanUtils.toBean(tmplTpFldDO, TmplFldRespVO.class);
@@ -96,4 +98,10 @@ public class TmplTpFldServiceImpl extends ServiceImpl<TmplTpFldMapper, TmplTpFld
     public List<TmplTpFldDO> getTmplTpListByValKeys(List<String> valNames) {
         return baseMapper.selectList(new LambdaQueryWrapper<TmplTpFldDO>().in(TmplTpFldDO::getFldKy, valNames));
     }
+
+    @Override
+    public void updateTmplTpSts(UpdateStsVO updateStsVO) {
+        log.info("更新模板字段状态，参数：【{}】", updateStsVO);
+        baseMapper.update(Wrappers.<TmplTpFldDO>lambdaUpdate().set(TmplTpFldDO::getSts, updateStsVO.getSts()).in(TmplTpFldDO::getId, updateStsVO.getIds()));
+    }
 }

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

@@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,10 +32,15 @@ public interface ContractApi {
     CommonResult<Boolean> updateOrderStatus(@RequestParam("orderId") Long orderId, @RequestParam("status") String status);
 
     @PostMapping(PREFIX + "/order-by-order-no")
-    @Operation(summary = "更新订单状态", description = "通过订单编号获取订单信息")
+    @Operation(summary = "通过订单编号获取订单信息", description = "通过订单编号获取订单信息")
     CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderNo(@RequestBody List<String> orderNoS);
 
     @PostMapping(PREFIX + "/create")
     @Operation(summary = "创建合同")
     CommonResult<Boolean> create(@Valid @RequestBody ContractSaveReqVO reqVO);
+
+    @PostMapping(PREFIX + "/order-by-order-id")
+    @Operation(summary = "通过订单id获取订单信息", description = "通过订单编号获取订单信息")
+    CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderIds(@RequestBody List<Long> ids);
+
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java

@@ -76,4 +76,26 @@ public class ContractApiImpl implements ContractApi {
                 reqVO);
         return success(true);
     }
+
+    @Override
+    public CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderIds(List<Long> ids) {
+        if (ids==null||ids.isEmpty()){
+            throw new RuntimeException("订单id为空");
+        }
+        List<PurchaseOrderWithDetailsDTO> purchaseOrderWithDetailsDTOS = new ArrayList<>();
+        List<PurchaseOrderDetailsRespVO> purchaseOrderWithDetailsVOS = purchaseOrderService.getOrderByIds(ids);
+        purchaseOrderWithDetailsVOS.forEach(purchaseOrderWithDetailsVO -> {
+            if (purchaseOrderWithDetailsVO!= null) {
+                PurchaseOrderWithDetailsDTO purchaseOrderWithDetailsDTO = BeanUtils.toBean(purchaseOrderWithDetailsVO,
+                        PurchaseOrderWithDetailsDTO.class);
+                if (purchaseOrderWithDetailsVO.getOrderDetails().isEmpty()) {
+                    purchaseOrderWithDetailsDTO.setOrderDetails(new ArrayList<>());
+                } else {
+                    purchaseOrderWithDetailsDTO.setOrderDetails(BeanUtils.toBean(purchaseOrderWithDetailsVO.getOrderDetails(), PrchOrdDtlDTO.class));
+                }
+                purchaseOrderWithDetailsDTOS.add(purchaseOrderWithDetailsDTO);
+            }
+        });
+        return success(purchaseOrderWithDetailsDTOS);
+    }
 }

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

@@ -163,7 +163,7 @@ public class PurchaseOrderController implements BusinessControllerMarker {
     //根据订单id修改订单状态
     @PutMapping("/update-order-status")
     @Operation(summary = "批量修改订单状态", description = "sts取值于字典名称'采购订单状态',字典类型'PRCH_ORD_STS' 可以根据订单号和订单id修改")
-    public CommonResult<Boolean> updateOrderStatus(@RequestBody @Validated PurchaseOrderStsReqVO req) {
+    public CommonResult<Boolean> updateOrderStatus(@RequestBody @Validated OrderStsReqVO req) {
         purchaseOrderService.updateOrderStatusByIdOrOrderNo(req);
         return success(true);
     }

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

@@ -0,0 +1,23 @@
+package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+
+import java.util.List;
+
+
+@Schema(description = "管理后台 - 订单状态 Request VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OrderStsReqVO {
+    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "26419")
+    private List<Long> ids;
+    @Schema(description = "订单状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "订单状态不能为空")
+    private String sts;
+    @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private List<String> orderNos;
+}

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

@@ -1,23 +0,0 @@
-package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.Data;
-
-
-import java.util.List;
-
-
-@Schema(description = "管理后台 - 采购订单状态 Request VO")
-@Data
-@ExcelIgnoreUnannotated
-public class PurchaseOrderStsReqVO {
-    @Schema(description = "采购订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "26419")
-    private List<Long> ids;
-    @Schema(description = "采购订单状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "采购订单状态不能为空")
-    private String sts;
-    @Schema(description = "采购订单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private List<String> orderNos;
-}

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

@@ -56,7 +56,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新采购订单")
+    @Operation(summary = "更新销售订单")
     @PreAuthorize("@ss.hasPermission('base:sales-order:update')")
     public CommonResult<Boolean> updateSalesOrder(@Valid @RequestBody SalesOrderSaveReqVO updateReqVO) {
         salesOrderService.updateSalesOrder(updateReqVO);
@@ -64,7 +64,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除采购订单")
+    @Operation(summary = "删除销售订单")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('base:sales-order:delete')")
     public CommonResult<Boolean> deleteSalesOrder(@RequestParam("id") Long id) {
@@ -74,7 +74,7 @@ public class SalesOrderController implements BusinessControllerMarker {
 
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
-    @Operation(summary = "批量删除采购订单")
+    @Operation(summary = "批量删除销售订单")
                 @PreAuthorize("@ss.hasPermission('base:sales-order:delete')")
     public CommonResult<Boolean> deleteSalesOrderList(@RequestBody BatchDeleteReqVO req) {
         salesOrderService.deleteSalesOrderListByIds(req.getIds());
@@ -82,8 +82,8 @@ public class SalesOrderController implements BusinessControllerMarker {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得采购订单")
+    @Operation(summary = "获得销售订单")
-    @Parameter(name = "id", description = "id是订单主键，splyBsnTp是订单类型采购或者是消费", required = true, example = "1024")
+    @Parameter(name = "id", description = "id是订单主键，splyBsnTp是订单类型销售或者是消费", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('base:sales-order:query')")
     public CommonResult<SalesOrderRespVO> getSalesOrder(@RequestParam("id") Long id,@RequestParam(value = "splyBsnTp",required = false) String splyBsnTp) {
         SalesOrderDO purchaseOrder = salesOrderService.getSalesOrder(id, splyBsnTp);
@@ -96,7 +96,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得采购订单分页")
+    @Operation(summary = "获得销售订单分页")
     @PreAuthorize("@ss.hasPermission('base:sales-order:query')")
     public CommonResult<PageResult<SalesOrderRespVO>> getSalesOrderPage(@Valid SalesOrderPageReqVO pageReqVO) {
         PageResult<SalesOrderDO> pageResult = salesOrderService.getSalesOrderPage(pageReqVO);
@@ -109,7 +109,7 @@ public class SalesOrderController implements BusinessControllerMarker {
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出采购订单 Excel")
+    @Operation(summary = "导出销售订单 Excel")
     @PreAuthorize("@ss.hasPermission('base:sales-order:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportSalesOrderExcel(@Valid SalesOrderPageReqVO pageReqVO,
@@ -117,7 +117,7 @@ public class SalesOrderController implements BusinessControllerMarker {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<SalesOrderDO> list = salesOrderService.getSalesOrderPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "采购订单.xls", "数据", PurchaseOrderRespVO.class,
+        ExcelUtils.write(response, "销售订单.xls", "数据", PurchaseOrderRespVO.class,
                         BeanUtils.toBean(list, PurchaseOrderRespVO.class));
     }
 
@@ -162,4 +162,11 @@ public class SalesOrderController implements BusinessControllerMarker {
         return success(salesOrderService.getBindOrderByOrder(reqVO));
     }
 
+    @PutMapping("/update-order-status")
+    @Operation(summary = "批量修改订单状态", description = "sts取值于字典名称'销售订单状态',字典类型'PRCH_ORD_STS' 可以根据订单号和订单id修改")
+    public CommonResult<Boolean> updateOrderStatus(@RequestBody @Validated OrderStsReqVO req) {
+        salesOrderService.updateOrderStatusByIdOrOrderNo(req);
+        return success(true);
+    }
+
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderService.java

@@ -96,7 +96,7 @@ public interface PurchaseOrderService {
      * @param reqVO 订单状态
      *
      */
-    void updateOrderStatusByIdOrOrderNo(PurchaseOrderStsReqVO reqVO);
+    void updateOrderStatusByIdOrOrderNo(OrderStsReqVO reqVO);
     /**
      * 获取物料
      *
@@ -124,4 +124,6 @@ public interface PurchaseOrderService {
      * @return 结果
      */
     Boolean linkOrder(@Valid  LinkOrderReqVO LinkOrderReqVO);
+
+    List<PurchaseOrderDetailsRespVO>  getOrderByIds(List<Long> ids);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java

@@ -425,7 +425,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     }
 
     @Override
-    public void updateOrderStatusByIdOrOrderNo(PurchaseOrderStsReqVO reqVO) {
+    public void updateOrderStatusByIdOrOrderNo(OrderStsReqVO reqVO) {
         // 校验存在
         if (reqVO.getIds() != null) {
             validatePurchaseOrderExists(reqVO.getIds());
@@ -494,6 +494,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         return systemRelativityMapper.insert(saveDO) > 0;
     }
 
+
+
     private void setValue(ErpOrderUpdateReqVO erpOrderUpdateReqVO, PurchaseOrderWithDetailsVO purchaseOrderWithDetailsVO) {
         //head
         PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(purchaseOrderWithDetailsVO.getPurchaseOrder().getId());
@@ -607,16 +609,17 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
             throw exception(PURCHASE_ORDER_NOT_EXISTS);
         }
         String contractNumber = purchaseOrderDO.getContractNumber();// 合同号
+        ContractRespVO contractRespVO = contractService.getBySystemContractNumber(contractNumber);
 
         ContractRespVO upRelation = null;
         if ("up".equals(reqVO.getOrderType())) {
             log.info("获取上游订单");
             //上游
-            upRelation = contractService.getUpRelation(Long.valueOf(contractNumber));
+            upRelation = contractService.getUpRelation(contractRespVO.getId());
         } else {
             //下游
             log.info("获取下游订单");
-            upRelation = contractService.getDownRelation(Long.valueOf(contractNumber));
+            upRelation = contractService.getDownRelation(contractRespVO.getId());
         }
         List<DownOrUpOrderRespVO> orderList = new ArrayList<>();
         if (upRelation != null) {
@@ -662,4 +665,16 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         }
         return orderList;
     }
+
+    @Override
+    public List<PurchaseOrderDetailsRespVO> getOrderByIds(List<Long> ids) {
+        List<PurchaseOrderWithDetailsVO> purchaseOrderWithDetailsVOS = purchaseOrderMapper.selectOrderByIds(ids);
+        List<PurchaseOrderDetailsRespVO> purchaseOrderDetailsRespVOS = new ArrayList<>();
+        purchaseOrderWithDetailsVOS.forEach(purchaseOrderWithDetailsVO -> {
+            PurchaseOrderDetailsRespVO purchaseOrderDetailsRespVO = BeanUtils.toBean(purchaseOrderWithDetailsVO.getPurchaseOrder(), PurchaseOrderDetailsRespVO.class);
+            purchaseOrderDetailsRespVO.setOrderDetails(BeanUtils.toBean(purchaseOrderWithDetailsVO.getOrderDetails(), PrchOrdDtlDetailsRespVO.class));
+            purchaseOrderDetailsRespVOS.add(purchaseOrderDetailsRespVO);
+        });
+        return purchaseOrderDetailsRespVOS;
+    }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderService.java

@@ -114,4 +114,11 @@ public interface SalesOrderService {
      */
 
     List<PurchaseOrderRespVO> getBindOrderByOrder(DownOrUpOrderReqVO reqVO);
+    /**
+     * 修改订单状态
+     *
+     * @param req 采购订单
+     *
+     */
+   void updateOrderStatusByIdOrOrderNo(OrderStsReqVO req);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java

@@ -5,19 +5,18 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONException;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
 import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi;
 import com.zt.plat.module.bpm.api.task.BpmTaskApi;
 import com.zt.plat.module.bpm.api.task.dto.*;
 import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
 import com.zt.plat.module.contractorder.api.vo.contract.ContractRespVO;
-import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.DownOrUpOrderReqVO;
+import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*;
-import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.DownOrUpOrderRespVO;
-import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.LinkOrderReqVO;
-import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseOrderRespVO;
 import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.*;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.SystemRelativityDO;
-import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
 import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDO;
 import com.zt.plat.module.contractorder.dal.mysql.contract.SystemRelativityMapper;
 import com.zt.plat.module.contractorder.dal.mysql.salesorder.SalesOrderMapper;
@@ -30,21 +29,17 @@ import com.zt.plat.module.erp.service.erp.ErpOrderService;
 import com.zt.plat.module.system.api.sequence.SequenceApi;
 import com.zt.plat.module.system.api.user.AdminUserApi;
 import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
+import java.util.ArrayList;
-
+import java.util.List;
-import com.zt.plat.framework.common.pojo.PageResult;
-
-import com.zt.plat.framework.common.util.object.BeanUtils;
-
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_ORDER_EXISTS;
@@ -387,16 +382,16 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             throw exception(PURCHASE_ORDER_NOT_EXISTS);
         }
         String contractNumber = salesOrderDO.getContractNumber();// 合同号
-
+        ContractRespVO bySystemContractNumber = contractService.getBySystemContractNumber(contractNumber);
         ContractRespVO upRelation = null;
         if ("up".equals(reqVO.getOrderType())) {
             log.info("获取上游订单");
             //上游
-            upRelation = contractService.getUpRelation(Long.valueOf(contractNumber));
+            upRelation = contractService.getUpRelation(bySystemContractNumber.getId());
         } else {
             //下游
             log.info("获取下游订单");
-            upRelation = contractService.getDownRelation(Long.valueOf(contractNumber));
+            upRelation = contractService.getDownRelation(bySystemContractNumber.getId());
         }
         List<DownOrUpOrderRespVO> orderList = new ArrayList<>();
         if (upRelation != null) {
@@ -442,4 +437,27 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         }
         return orderList;
     }
+
+    @Override
+    public void updateOrderStatusByIdOrOrderNo(OrderStsReqVO reqVO) {
+        // 校验存在
+        if (reqVO.getIds() != null) {
+            validateSalesOrderExists(reqVO.getIds());
+        }
+        if (reqVO.getOrderNos() != null) {
+            validateSalesOrderNosExists(reqVO.getOrderNos());
+        }
+        OrderStatusEnum byCode = OrderStatusEnum.getByCode(reqVO.getSts());
+        if (byCode == null) {
+            throw exception(PURCHASE_ORDER_STATUS_ERROR);
+        }
+        salesOrderMapper.update(new LambdaUpdateWrapper<SalesOrderDO>().in(reqVO.getOrderNos() != null, SalesOrderDO::getSystemOrderNumber, reqVO.getOrderNos()).in(reqVO.getIds() != null, SalesOrderDO::getId, reqVO.getIds()).set(SalesOrderDO::getStatus, reqVO.getSts()));
+    }
+
+    private void validateSalesOrderNosExists(List<String> orderNos) {
+        List<SalesOrderDO> list = salesOrderMapper.selectList(new LambdaQueryWrapper<SalesOrderDO>().in(SalesOrderDO::getSystemOrderNumber, orderNos));
+        if (CollUtil.isEmpty(list) || list.size() != orderNos.size()) {
+            throw exception(PURCHASE_ORDER_NOT_EXISTS);
+        }
+    }
 }