From 3594ee8af853949d39589f4dbdf86c7f5d7f088b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 02 四月 2024 10:01:57 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml | 22 +++++++---
web/src/views/modules/basicInfo/SelectTyModel.vue | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 35 +++++++++--------
modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml | 8 ++-
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java | 9 +++-
5 files changed, 47 insertions(+), 28 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 7837c47..1edde61 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,13 +49,13 @@
@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));
}
@@ -76,7 +76,7 @@
@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 +99,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());
+ 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 +127,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 +138,7 @@
@DeleteMapping
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
xhProductModelService.delete(ids);
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java
index 2288545..d240b5e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java
@@ -89,9 +89,14 @@
sysPictureBaseService.insert(sysPictureBase);
}
if (sysPictureBase.getIsDefault()==1){
- if (!sysPictureBase.getId().equals(pictureBase.getId())){
+ if (pictureBase.getId()==null){
sysPictureBaseService.updateByDefault(sysPictureBase.getId(),sysPictureBase.getProductType());
- sysPictureBaseService.updateProdeuctImg(sysPictureBase.getId(),sysPictureBase.getProductType(),pictureBase.getId());
+ sysPictureBaseService.updateProdeuctImg(sysPictureBase.getId(),sysPictureBase.getProductType(),null);
+ }else{
+ if (!sysPictureBase.getId().equals(pictureBase.getId())){
+ sysPictureBaseService.updateByDefault(sysPictureBase.getId(),sysPictureBase.getProductType());
+ sysPictureBaseService.updateProdeuctImg(sysPictureBase.getId(),sysPictureBase.getProductType(),pictureBase.getId());
+ }
}
}
if (file != null) {
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
index 31fa950..b4287cb 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -18,7 +18,7 @@
and ${whereSql}
</if>
</where>
- ORDER BY sort
+ ORDER BY sort
</select>
<select id="getNo" resultType="java.lang.Integer">
SELECT COUNT(*)
@@ -32,6 +32,7 @@
and pid is null
</if>
</where>
+ Group by product_type
</select>
<select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
select a.name, a.id
@@ -40,7 +41,7 @@
and a.product_type = 5
</select>
<select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
- SELECT a.operat_img as imgPath,
+ SELECT a.operat_img as imgPath,
a.`NAME` as imgName,
'node' as nodeType,
'' as nodeTypeExt,
@@ -62,7 +63,8 @@
left join sys_picture_base s on s.id = a.operat_img
WHERE a.is_delete = 0
AND ((a.PID = ${productId})
- or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and a.product_type <> 10))
+ or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and
+ a.product_type <> 10))
</select>
<select id="getTaskProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
diff --git a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml b/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
index 34b47dc..84fa2fc 100644
--- a/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
@@ -12,14 +12,22 @@
<update id="updateProdeuctImg">
UPDATE product_model_common
set operat_img = ${id}
- where node_type = ${productType}
- and operat_img =${pictureBaseId}
- and is_delete = 0;
- update product_model
+ <where>
+ node_type = ${productType}
+ and is_delete = 0
+ <if test="pictureBaseId!=null">
+ and operat_img =${pictureBaseId}
+ </if>
+ </where>
+ ;update product_model
set operat_img=${id}
- where product_type = ${productType}
- and operat_img =${pictureBaseId}
- and is_delete = 0
+ <where>
+ product_type = ${productType}
+ and is_delete = 0
+ <if test="pictureBaseId!=null">
+ and operat_img =${pictureBaseId}
+ </if>
+ </where>
</update>
<select id="getList" resultType="com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase">
diff --git a/web/src/views/modules/basicInfo/SelectTyModel.vue b/web/src/views/modules/basicInfo/SelectTyModel.vue
index d12773f..19ca724 100644
--- a/web/src/views/modules/basicInfo/SelectTyModel.vue
+++ b/web/src/views/modules/basicInfo/SelectTyModel.vue
@@ -15,6 +15,7 @@
<el-table-column prop="name" label="鍚嶇О"/>
<zt-table-column-dict v-if="!pageCode" prop="nodeType" label="鑺傜偣绫诲瀷" dict="product"/>
<zt-table-column-dict v-else prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
+ <el-table-column prop="sort" label="鎺掑簭"/>
</el-table>
</zt-table-wraper>
</div>
--
Gitblit v1.9.1