From 3ca8ce266bf5b06556d80c78b31405e7a54aa4e5 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 24 六月 2024 11:01:13 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
index 5656750..989116c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -30,12 +30,12 @@
 /**
  * product_model
  *
- * @author zt generator 
+ * @author zt generator
  * @since 1.0.0 2024-02-29
  */
 @RestController
 @RequestMapping("/basicInfo/XhProductModel/")
-@Api(tags="product_model")
+@Api(tags = "product_model")
 public class XhProductModelController {
     @Autowired
     private XhProductModelService xhProductModelService;
@@ -49,34 +49,32 @@
     @GetMapping("page")
     @ApiOperation("鍒嗛〉")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
-        @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
-        @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
-        @ApiImplicitParam(name = "productType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "product_type^EQ"),
-        @ApiImplicitParam(name = "pid", value = "涓婄骇ID", dataType = Constant.QT.STRING)
+            @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+            @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = Constant.QT.STRING, format = "NAME^LK"),
+            @ApiImplicitParam(name = "productType", value = "鑺傜偣绫诲瀷", dataType = Constant.QT.STRING, format = "product_type^EQ"),
+            @ApiImplicitParam(name = "pid", value = "涓婄骇ID", dataType = Constant.QT.STRING)
     })
-    public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+    public Result<List<XhProductModel>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
         return Result.ok(xhProductModelService.page(queryFilter));
     }
 
     @GetMapping("tree")
-    public Result<List<XhProductModel>> getTreeList() {
-        List<XhProductModel> list = xhProductModelService.getAllTree();
+    public Result<List<XhProductModel>> getTreeList(Boolean showXdy) {
+        List<XhProductModel> list = xhProductModelService.getAllTree(showXdy);
 
         return Result.ok(list);
     }
 
     @GetMapping("getProduct")
     public Result<List<ProductImg>> getProduct(Long productId) {
-
         List<ProductImg> list = xhProductModelService.getProduct(productId);
-
         return Result.ok(list);
     }
 
     @GetMapping("{id}")
     @ApiOperation("淇℃伅")
-    public Result<XhProductModel> get(@PathVariable("id") Long id){
+    public Result<XhProductModel> get(@PathVariable("id") Long id) {
         XhProductModel data = xhProductModelService.get(id);
         if (data.getOperatImg() != null) {
             data.setOperatImgName(sysPictureBaseService.get(data.getOperatImg()).getName());
@@ -99,22 +97,25 @@
     @PostMapping
     @ApiOperation("鏂板")
     @LogOperation("鏂板")
-    public Result insert(@RequestBody XhProductModel xhProductModel){
+    public Result insert(@RequestBody XhProductModel xhProductModel) {
         //鏁堥獙鏁版嵁
         ValidatorUtils.validateEntity(xhProductModel, AddGroup.class, DefaultGroup.class);
-        Integer no = xhProductModelService.getNo(xhProductModel.getPid());
-        xhProductModel.setSort(no + 1);
 
+        Integer no = xhProductModelService.getNo(xhProductModel.getPid(),xhProductModel.getProductType());
+        if (xhProductModel.getSort() < no) {
+            xhProductModel.setSort(no + 1);
+        }
         xhProductModelService.insert(xhProductModel);
 
         return Result.ok();
     }
 
     @PostMapping("get")
-    public Result getSelect(@RequestBody List<XhProductModel> list){
-        for(XhProductModel xhProductModel:list){
+    public Result getSelect(@RequestBody List<XhProductModel> list) {
+        for (XhProductModel xhProductModel : list) {
             xhProductModel.setSrcId(xhProductModel.getId());
             xhProductModel.setId(null);
+            xhProductModel.setSort(xhProductModel.getSort());
             xhProductModel.setProductType(xhProductModel.getNodeType());
             this.insert(xhProductModel);
         }
@@ -124,7 +125,7 @@
     @PutMapping
     @ApiOperation("淇敼")
     @LogOperation("淇敼")
-    public Result update(@RequestBody XhProductModel xhProductModel){
+    public Result update(@RequestBody XhProductModel xhProductModel) {
         //鏁堥獙鏁版嵁
         ValidatorUtils.validateEntity(xhProductModel, UpdateGroup.class, DefaultGroup.class);
         xhProductModelService.update(xhProductModel);
@@ -135,7 +136,7 @@
     @DeleteMapping
     @ApiOperation("鍒犻櫎")
     @LogOperation("鍒犻櫎")
-    public Result delete(@RequestBody Long[] ids){
+    public Result delete(@RequestBody Long[] ids) {
         //鏁堥獙鏁版嵁
         AssertUtils.isArrayEmpty(ids, "id");
         xhProductModelService.delete(ids);

--
Gitblit v1.9.1