v1.7.0

README.md

@@ -64,4 +64,23 @@ http://120.25.146.52:3090/project/297/interface/api/9528
     添加接口  /service/sale/repairInvoice/invoiceRegister   入参和微信端开票申请一模一样
 6. 
     添加接口 /service/sale/repairInvoice/getInvoiceInfo   开票信息详情回显
+~~~~
+
+###**v1.5.0**
+~~~~
+文档地址：http://120.25.146.52:3090/project/297/interface/api/cat_2059
+1.添加数据字典列表
+    /service/sale/dict/list/{dictKey}
+    /service/sale/dict/tree/{dictKey}
+    
+    repair-type 维修类型
+    repair-item 维修物品
+    fault-type  故障类型
+
+2.录单添加字段
+    repairType      维修类型
+    repairItem      维修物品 子集 - 隔开
+
+3.添加修改维修完成备注接口
+     /service/sale/repairPersonnel/repairOverRemark
 ~~~~

doc/update.1.7.0.sql

@@ -0,0 +1,6 @@
+ALTER TABLE `4dkankan_v4_sale`.`t_repair`
+    ADD COLUMN `repair_type` varchar(255) NULL AFTER `cancel_remark`,
+    ADD COLUMN `repair_item` varchar(255) NULL AFTER `repair_type`;
+
+ALTER TABLE `4dkankan_v4_sale`.`t_repair_register`
+    ADD COLUMN `fault_type` varchar(255) NULL AFTER `define_damage`;

src/main/java/com/fdkankan/sale/controller/DictController.java

@@ -0,0 +1,40 @@
+package com.fdkankan.sale.controller;
+
+
+import com.fdkankan.sale.common.ResultData;
+import com.fdkankan.sale.service.IDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2025-01-16
+ */
+@RestController
+@RequestMapping("/sale/dict")
+public class DictController {
+
+    @Autowired
+    IDictService dictService;
+
+    @GetMapping("/list/{dictKey}")
+    public ResultData getListByKey(@PathVariable String dictKey){
+
+        return ResultData.ok(dictService.getListByKey(dictKey));
+    }
+
+    @GetMapping("/tree/{dictKey}")
+    public ResultData getTreeByKey(@PathVariable String dictKey){
+
+        return ResultData.ok(dictService.getTreeByKey(dictKey));
+    }
+}
+

src/main/java/com/fdkankan/sale/controller/RepairPersonnelController.java

@@ -4,10 +4,7 @@ package com.fdkankan.sale.controller;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.sale.common.ResultCode;
 import com.fdkankan.sale.common.ResultData;
-import com.fdkankan.sale.entity.OrderReceiving;
-import com.fdkankan.sale.entity.PriceList;
-import com.fdkankan.sale.entity.Repair;
-import com.fdkankan.sale.entity.SysUser;
+import com.fdkankan.sale.entity.*;
 import com.fdkankan.sale.exception.BusinessException;
 import com.fdkankan.sale.service.IPartService;
 import com.fdkankan.sale.service.IRepairService;
@@ -83,6 +80,11 @@ public class RepairPersonnelController extends BaseController{
         return ResultData.ok();
     }
 
+    @PostMapping("/repairOverRemark")
+    public ResultData repairOverRemark(@RequestBody RepairRegister param){
+        repairPersonnelService.repairOverRemark(param,getUserId());
+        return ResultData.ok();
+    }
 
 }
 

src/main/java/com/fdkankan/sale/entity/Dict.java

@@ -0,0 +1,55 @@
+package com.fdkankan.sale.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2025-01-16
+ */
+@Getter
+@Setter
+@TableName("t_dict")
+public class Dict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("dict_key")
+    private String dictKey;
+
+    @TableField("parent_id")
+    private Integer parentId;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private List<Dict> children;
+
+}

src/main/java/com/fdkankan/sale/entity/Repair.java

@@ -121,6 +121,12 @@ public class Repair implements Serializable {
     @TableField("cancel_remark")
     private String cancelRemark;
 
+    @TableField("repair_type")
+    private String repairType;
+
+    @TableField("repair_item")
+    private String repairItem;
+
     @TableField(exist = false)
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal payAmount;

src/main/java/com/fdkankan/sale/entity/RepairRegister.java

@@ -84,4 +84,7 @@ public class RepairRegister implements Serializable {
     @TableField("define_damage")
     private Integer defineDamage;
 
+    @TableField("fault_type")
+    private String faultType;
+
 }

src/main/java/com/fdkankan/sale/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"sale", getTables(new String[]{
-                "t_price_list_log",
+                "t_dict",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/sale/mapper/IDictMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.sale.mapper;
+
+import com.fdkankan.sale.entity.Dict;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-01-16
+ */
+@Mapper
+public interface IDictMapper extends BaseMapper<Dict> {
+
+}

src/main/java/com/fdkankan/sale/service/IDictService.java

@@ -0,0 +1,20 @@
+package com.fdkankan.sale.service;
+
+import com.fdkankan.sale.entity.Dict;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-01-16
+ */
+public interface IDictService extends IService<Dict> {
+
+
+    Object getListByKey(String dictKey);
+
+    Object getTreeByKey(String dictKey);
+}

src/main/java/com/fdkankan/sale/service/IRepairRegisterService.java

@@ -28,4 +28,5 @@ public interface IRepairRegisterService extends IService<RepairRegister> {
 
     RepairRegisterVo getVoByRegisterLogId(Integer registerLogId);
 
+    void repairOverRemark(String repairId, String remark);
 }

src/main/java/com/fdkankan/sale/service/impl/DictServiceImpl.java

@@ -0,0 +1,58 @@
+package com.fdkankan.sale.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.sale.entity.Dict;
+import com.fdkankan.sale.mapper.IDictMapper;
+import com.fdkankan.sale.service.IDictService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-01-16
+ */
+@Service
+public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements IDictService {
+
+    @Override
+    public Object getListByKey(String dictKey) {
+        LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Dict::getDictKey,dictKey);
+        return this.list(wrapper);
+    }
+
+
+    @Override
+    public Object getTreeByKey(String dictKey) {
+        LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Dict::getDictKey,dictKey);
+        List<Dict> list = this.list(wrapper);
+        if(list.isEmpty()){
+            return list;
+        }
+        List<Dict> parent = list.stream().filter(e -> e.getParentId() == null).collect(Collectors.toList());
+        if(list.size() == parent.size()){
+            return list;
+        }
+
+        return getVoList(parent,list);
+
+    }
+
+    private List<Dict> getVoList (List<Dict> oneList,List<Dict> allList){
+        for (Dict dict : oneList) {
+            List<Dict> twoList = allList.stream().filter(e -> e.getParentId() !=null && e.getParentId().equals(dict.getId())).collect(Collectors.toList());
+            if(!twoList.isEmpty()){
+                dict.setChildren(getVoList(twoList,allList));
+            }
+        }
+        return oneList;
+    }
+}

src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

@@ -279,4 +279,11 @@ public class RepairPersonnelService {
 
         return vo;
     }
+
+    public void repairOverRemark(RepairRegister param, Long userId) {
+        if(StringUtils.isBlank(param.getRemark()) || StringUtils.isBlank(param.getRepairId())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        repairRegisterService.repairOverRemark(param.getRepairId(),param.getRemark());
+    }
 }

src/main/java/com/fdkankan/sale/service/impl/RepairRegisterServiceImpl.java

@@ -116,4 +116,12 @@ public class RepairRegisterServiceImpl extends ServiceImpl<IRepairRegisterMapper
         vo.setPartNamesStr(partNamesList.toString());
     }
 
+
+    @Override
+    public void repairOverRemark(String repairId, String remark) {
+        LambdaUpdateWrapper<RepairRegister> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(RepairRegister::getRepairId,repairId);
+        wrapper.set(RepairRegister::getRemark,remark);
+        this.update(wrapper);
+    }
 }

src/main/resources/mapper/sale/DictMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.sale.mapper.IDictMapper">
+
+</mapper>