物资入院申请等相关修改

src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java

@@ -33,14 +33,13 @@ import com.glxp.api.res.thrsys.UdiInfoResponse;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.*;
-import com.glxp.api.service.thrsys.ThrProductsAddDiService;
 import com.glxp.api.service.thrsys.ThrProductsService;
 import com.glxp.api.service.thrsys.ThrSystemService;
+import com.glxp.api.service.thrsys.impl.ThrProductsAddDiService;
 import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.SupplementVailUtil;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -52,7 +51,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.rmi.server.UID;
 import java.util.Date;
 import java.util.List;
 
@@ -134,13 +132,13 @@ public class ThrProductsAddDiController {
         if (vailResult != null)
             return ResultVOUtils.error(500, vailResult);
 
-        List<String> uuids = addThrDiProductsRequest.getUuids();
+        List<String> devKeys = addThrDiProductsRequest.getDevKeys();
-        if (CollUtil.isEmpty(uuids)) {
+        if (CollUtil.isEmpty(devKeys)) {
             return ResultVOUtils.error(500, "参数错误");
         }
-        ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiService.selecByUuid(uuids.get(0));
+        Boolean b = thrProductsAddDiService.exits(devKeys.get(0));
-        if (thrProductsAddDiEntity != null) {
+        if (IntUtil.value(b)) {
-            return ResultVOUtils.error(500, "产品已存在，请勿重复提交！");
+            return ResultVOUtils.error(500, "该产品已存在，请勿重复添加！");
         }
         thrProductsAddDiService.addThrAddDiProducts(addThrDiProductsRequest);
         return ResultVOUtils.success("提交成功！");
@@ -234,7 +232,7 @@ public class ThrProductsAddDiController {
 //                udiInfoService.updateUdiInfo(udiInfoEntity);
                     //回填关联关系到关联表
                     CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
-                    companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId());
+                    companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId() + "");
                     companyProductRelevanceEntity.setUdiRlIdFk(udiRelIdFk);
                     companyProductRelevanceEntity.setCreateTime(new Date());
                     companyProductRelevanceEntity.setUpdateTime(new Date());
@@ -345,7 +343,7 @@ public class ThrProductsAddDiController {
             thrProductsAdddiEntity.setCreateTime(new Date());
             thrProductsAdddiEntity.setStatus(1); //未审核
             thrProductsAdddiEntity.setType(2);
-            thrProductsAdddiEntity.setCustomerId(customerId);
+            thrProductsAdddiEntity.setCustomerId(Long.parseLong(customerId));
             thrProductsAdddiEntity.setUpdateTime(new Date());
             thrProductsAddDiService.insertThrProducts(thrProductsAdddiEntity);
         }
@@ -402,7 +400,7 @@ public class ThrProductsAddDiController {
 
                         //回填关联关系到关联表
                         CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
-                        companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId());
+                        companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId() + "");
                         companyProductRelevanceEntity.setUdiRlIdFk(udiRelIdFk);
                         companyProductRelevanceEntity.setCreateTime(new Date());
                         companyProductRelevanceEntity.setUpdateTime(new Date());

src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.thrsys;
 
 
+import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.res.thrsys.ThrProductsAddDiResponse;
@@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface ThrProductsAddDiDao {
+public interface ThrProductsAddDiDao extends BaseMapperPlus<ThrProductsAddDiDao, ThrProductsAddDiEntity, ThrProductsAddDiEntity> {
 
     /**
      * 添加产品信息
@@ -35,12 +36,12 @@ public interface ThrProductsAddDiDao {
 
     UdiInfoResponse getDiProductDetail(@Param("uuid") String uuid);
 
-    /** 根据ID查询 */
+    /**
+     * 根据ID查询
+     */
     ThrProductsAddDiEntity filterThrProductsGetId(@Param("id") Integer id);
-    ThrProductsAddDiEntity filterThrProductsGetUuid(@Param("uuid") String uuid);
 
-
+    ThrProductsAddDiEntity filterThrProductsGetUuid(@Param("uuid") String uuid);
-    boolean insert(ThrProductsAddDiEntity thrProductsAddDiEntity);
 
     List<ThrProductsAddDiResponse> filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest);
 

src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java

@@ -1,5 +1,10 @@
 package com.glxp.api.entity.thrsys;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -8,94 +13,298 @@ import java.util.Date;
  * 供应商新增DI产品实体类
  */
 @Data
+@TableName("thr_products_add_di")
 public class ThrProductsAddDiEntity {
 
+
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "id主键")
     private Long id;
 
     /**
-     * 国家库产品UUID
+     * 产品UUID
      */
+    @TableField(value = "uuid")
+    @ApiModelProperty(value = "产品UUID")
     private String uuid;
 
     /**
-     * 添加此产品的客户ID
+     * 供应商客户ID
      */
-    private String customerId;
+    @TableField(value = "customerId")
+    @ApiModelProperty(value = "供应商客户ID")
+    private Long customerId;
 
     /**
      * 添加时间
      */
+    @TableField(value = "createTime")
+    @ApiModelProperty(value = "添加时间")
     private Date createTime;
 
     /**
      * 审核时间
      */
+    @TableField(value = "auditTime")
+    @ApiModelProperty(value = "审核时间")
     private Date auditTime;
 
     /**
-     * 审核人
+     * 备注
      */
-    private String auditUser;
+    @TableField(value = "remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
     /**
-     * 审核状态
+     * 审核人
      */
-    private int status;
+    @TableField(value = "auditUser")
+    @ApiModelProperty(value = "审核人")
+    private String auditUser;
 
     /**
-     * 备注
+     * 审核状态
      */
-    private String remark;
+    @TableField(value = "`status`")
-
+    @ApiModelProperty(value = "审核状态")
+    private Integer status;
 
+    @TableField(value = "thirdSysFk")
+    @ApiModelProperty(value = "")
     private String thirdSysFk;
+
+    @TableField(value = "code")
+    @ApiModelProperty(value = "")
     private String code;
+
+    @TableField(value = "sptm")
+    @ApiModelProperty(value = "")
     private String sptm;
+
+    @TableField(value = "ybbm")
+    @ApiModelProperty(value = "")
     private String ybbm;
+
+    @TableField(value = "measname")
+    @ApiModelProperty(value = "")
     private String measname;
+
+    @TableField(value = "manufactory")
+    @ApiModelProperty(value = "")
     private String manufactory;
+
+    @TableField(value = "spmc")
+    @ApiModelProperty(value = "")
     private String spmc;
+
+    @TableField(value = "cpms")
+    @ApiModelProperty(value = "")
     private String cpms;
-    private String selectThridSysStr;
 
+    @TableField(value = "price")
+    @ApiModelProperty(value = "")
     private String price;
+
+    @TableField(value = "selectThridSysStr")
+    @ApiModelProperty(value = "")
+    private String selectThridSysStr;
+
+    /**
+     * 备注字段1
+     */
+    @TableField(value = "basicPrductRemak1")
+    @ApiModelProperty(value = "备注字段1")
     private String basicPrductRemak1;
+
+    /**
+     * 备注字段2
+     */
+    @TableField(value = "basicPrductRemak2")
+    @ApiModelProperty(value = "备注字段2")
     private String basicPrductRemak2;
+
+    /**
+     * 备注字段3
+     */
+    @TableField(value = "basicPrductRemak3")
+    @ApiModelProperty(value = "备注字段3")
     private String basicPrductRemak3;
+
+    /**
+     * 备注字段4
+     */
+    @TableField(value = "basicPrductRemak4")
+    @ApiModelProperty(value = "备注字段4")
     private String basicPrductRemak4;
+
+    /**
+     * 备注字段5
+     */
+    @TableField(value = "basicPrductRemak5")
+    @ApiModelProperty(value = "备注字段5")
     private String basicPrductRemak5;
+
+    /**
+     * 备注字段6
+     */
+    @TableField(value = "basicPrductRemak6")
+    @ApiModelProperty(value = "备注字段6")
     private String basicPrductRemak6;
-    private String basicPrductRemak7;
-    private String basicPrductRemak8;
 
+    /**
+     * 备注字段7
+     */
+    @TableField(value = "basicPrductRemak7")
+    @ApiModelProperty(value = "备注字段7")
+    private String basicPrductRemak7;
 
+    /**
+     * 备注字段8
+     */
+    @TableField(value = "basicPrductRemak8")
+    @ApiModelProperty(value = "备注字段8")
+    private String basicPrductRemak8;
 
+    /**
+     * 通用名称
+     */
+    @TableField(value = "`name`")
+    @ApiModelProperty(value = "通用名称")
     private String name;
+
+    @TableField(value = "spec")
+    @ApiModelProperty(value = "")
     private String spec;
+
+    /**
+     * 注册证号
+     */
+    @TableField(value = "registerNo")
+    @ApiModelProperty(value = "注册证号")
     private String registerNo;
-    private String thirdName;
+
+    /**
+     * 产品类别
+     */
+    @TableField(value = "cplb")
+    @ApiModelProperty(value = "产品类别")
     private String cplb;
+
+    /**
+     * 分类编码
+     */
+    @TableField(value = "flbm")
+    @ApiModelProperty(value = "分类编码")
     private String flbm;
+
+    /**
+     * 器械类别
+     */
+    @TableField(value = "qxlb")
+    @ApiModelProperty(value = "器械类别")
     private String qxlb;
+
+    /**
+     * 注册人社会信用号
+     */
+    @TableField(value = "tyshxydm")
+    @ApiModelProperty(value = "注册人社会信用号")
     private String tyshxydm;
+
+    /**
+     * 注册证 备案证号
+     */
+    @TableField(value = "zczbhhzbapzbh")
+    @ApiModelProperty(value = "注册证 备案证号")
     private String zczbhhzbapzbh;
+
+    /**
+     * 注册/备案人名称
+     */
+    @TableField(value = "ylqxzcrbarmc")
+    @ApiModelProperty(value = "注册/备案人名称")
     private String ylqxzcrbarmc;
+
+    /**
+     * 注册/备案人英文名称
+     */
+    @TableField(value = "ylqxzcrbarywmc")
+    @ApiModelProperty(value = "注册/备案人英文名称")
     private String ylqxzcrbarywmc;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+    /**
+     * 供应商名称
+     */
+    @TableField(value = "supName")
+    @ApiModelProperty(value = "供应商名称")
     private String supName;
+
+    /**
+     * 型号
+     */
+    @TableField(value = "model")
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    /**
+     * 规格型号（规格型号二合一字段）
+     */
+    @TableField(value = "`standard`")
+    @ApiModelProperty(value = "规格型号（规格型号二合一字段）")
+    private String standard;
+
+    /**
+     * 其他编码
+     */
+    @TableField(value = "qtbm")
+    @ApiModelProperty(value = "其他编码")
+    private String qtbm;
+
+    /**
+     * 注册证有效期截止时间
+     */
+    @TableField(value = "zczyxqz")
+    @ApiModelProperty(value = "注册证有效期截止时间")
+    private String zczyxqz;
+
+    /**
+     * 关联ID主键
+     */
+    @TableField(value = "relId")
+    @ApiModelProperty(value = "关联ID主键")
+    private String relId;
+
+    /**
+     * 1第三方2自增
+     */
+    @TableField(value = "`type`")
+    @ApiModelProperty(value = "1第三方2自增")
+    private Integer type;
+
+    @TableField(value = "`deviceRecordKey`")
+    @ApiModelProperty(value = "1第三方2自增")
+    private String deviceRecordKey;
+
+
+    private static final long serialVersionUID = 1L;
+
+
+    private String thirdName;
     private boolean isChecked;
     private String corpName;
 
     //添加字段
-    private String model; //型号
-    private String standard; //规格型号，二合一字段
-    private String qtbm; //其他编码
-    private String zczyxqz; //注册有效期截止时间
     private Integer checkStatus;
     private String thirdSys;
-    private String relId;
     private String nameCode;
-    private Integer type;
 
 
 }

src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java

@@ -18,6 +18,9 @@ public class AddThrDiProductsRequest {
     @NotEmpty(message = "请选择需要添加的产品")
     private List<String> uuids;
 
+    private List<String> devKeys;
+
+
     /**
      * 客户ID
      */
@@ -45,5 +48,7 @@ public class AddThrDiProductsRequest {
     private String basicPrductRemak7;
     private String basicPrductRemak8;
 
+    private String deviceRecordKey;
+
 
 }

src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java

@@ -24,10 +24,6 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity {
 
     private String zczbhhzbapzbh;
 
-    private int status;
-
-    private String customerId;
-
     private String remark;
 
     private String companyName;
@@ -47,4 +43,6 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity {
     private String basicPrductRemak7;
     private String basicPrductRemak8;
 
+
+    private String deviceRecordKey;
 }

src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java

@@ -1,41 +0,0 @@
-package com.glxp.api.service.thrsys;
-
-
-import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
-import com.glxp.api.req.thrsys.AddThrDiProductsRequest;
-import com.glxp.api.req.thrsys.FilterThrProductsRequest;
-import com.glxp.api.res.thrsys.ThrProductsAddDiResponse;
-import com.glxp.api.res.thrsys.UdiInfoResponse;
-
-import java.util.List;
-
-public interface ThrProductsAddDiService {
-
-    List<ThrProductsAddDiResponse> filterThrProductsList(FilterThrProductsRequest filterThrProductsRequest);
-
-    ThrProductsAddDiResponse selecById(Long id);
-
-    ThrProductsAddDiResponse selecByUuid(String uuid);
-
-    /**
-     * 删除DI产品信息
-     *
-     * @param id
-     */
-    boolean delThrDiProducts(Long id);
-
-    boolean updateDiProduct(ThrProductsAddDiEntity thrProductsAddDiEntity);
-
-    boolean addThrAddDiProducts(AddThrDiProductsRequest thrDiProductsRequest);
-
-    UdiInfoResponse getDiProductDetail(String uuid);
-
-    /** 根据ID查询 */
-    ThrProductsAddDiEntity filterThrProductsGetId( Integer id);
-
-    boolean insertThrProducts(ThrProductsAddDiEntity thrProductsAddDiEntity);
-
-    List<ThrProductsAddDiResponse> filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest);
-
-    List<ThrProductsAddDiEntity> filterThrProductsDiLists(FilterThrProductsRequest filterThrProductsRequest);
-}

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java

@@ -4,8 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.auth.AuthCompanyMapper;
 import com.glxp.api.dao.thrsys.ThrProductsAddDiDao;
+import com.glxp.api.entity.auth.AuthCompany;
 import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
 import com.glxp.api.req.thrsys.AddThrDiProductsRequest;
@@ -13,8 +17,6 @@ import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.res.thrsys.ThrProductsAddDiResponse;
 import com.glxp.api.res.thrsys.UdiInfoResponse;
 import com.glxp.api.service.basic.ProductInfoService;
-import com.glxp.api.service.thrsys.ThrProductsAddDiService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,14 +27,14 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
+public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, ThrProductsAddDiEntity> {
 
     @Resource
     private ThrProductsAddDiDao thrProductsAddDiDao;
     @Resource
     private ProductInfoService productInfoService;
 
-    @Override
+
     public List<ThrProductsAddDiResponse> filterThrProductsList(FilterThrProductsRequest filterThrProductsRequest) {
         if (null != filterThrProductsRequest && filterThrProductsRequest.getPage() != null) {
             int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
@@ -49,7 +51,7 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
         return thrProductsAddDiResponses;
     }
 
-    @Override
+
     public ThrProductsAddDiResponse selecById(Long id) {
         FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
         filterThrProductsRequest.setId(id);
@@ -60,7 +62,7 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
         return null;
     }
 
-    @Override
+
     public ThrProductsAddDiResponse selecByUuid(String uuid) {
         if (StrUtil.isEmpty(uuid)) {
             return null;
@@ -74,17 +76,22 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
         return null;
     }
 
-    @Override
+
+    public boolean exits(String devKey) {
+        return thrProductsAddDiDao.exists(new QueryWrapper<ThrProductsAddDiEntity>().eq("deviceRecordKey", devKey));
+    }
+
+
     public boolean delThrDiProducts(Long id) {
         return thrProductsAddDiDao.deleteById(id);
     }
 
-    @Override
+
     public boolean updateDiProduct(ThrProductsAddDiEntity thrProductsAddDiEntity) {
         return thrProductsAddDiDao.updateDiProduct(thrProductsAddDiEntity);
     }
 
-    @Override
+
     public boolean addThrAddDiProducts(AddThrDiProductsRequest thrDiProductsRequest) {
 
         List<String> uuids = thrDiProductsRequest.getUuids();
@@ -95,7 +102,7 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
             ProductInfoEntity productInfoEntity = productInfoService.selectByUuid(uuid).get(0);
             ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity();
             BeanUtil.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity);
-            thrProductsAddDiEntity.setCustomerId(customerId + "");
+            thrProductsAddDiEntity.setCustomerId(customerId);
             thrProductsAddDiEntity.setUuid(uuid);
             thrProductsAddDiEntity.setType(1);
             thrProductsAddDiEntity.setYlqxzcrbarywmc(productInfoEntity.getYlqxzcrbarywmc());
@@ -130,11 +137,11 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
         return thrProductsAddDiDao.insertThrDiProducts(list);
     }
 
-    @Override
+
     public UdiInfoResponse getDiProductDetail(String uuid) {
         ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.filterThrProductsGetUuid(uuid);
         UdiInfoResponse udiInfoResponse = thrProductsAddDiDao.getDiProductDetail(uuid);
-        if(udiInfoResponse!=null){
+        if (udiInfoResponse != null) {
             udiInfoResponse.setSptm(thrProductsAddDiEntity.getSptm());
             udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm());
             udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
@@ -154,22 +161,22 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
         return udiInfoResponse;
     }
 
-    @Override
+
     public ThrProductsAddDiEntity filterThrProductsGetId(Integer id) {
         return thrProductsAddDiDao.filterThrProductsGetId(id);
     }
 
-    @Override
+
-    public boolean insertThrProducts(ThrProductsAddDiEntity thrProductsAddDiEntity) {
+    public int insertThrProducts(ThrProductsAddDiEntity thrProductsAddDiEntity) {
         return thrProductsAddDiDao.insert(thrProductsAddDiEntity);
     }
 
-    @Override
+
     public List<ThrProductsAddDiResponse> filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest) {
         return thrProductsAddDiDao.filterThrProductsDiList(filterThrProductsRequest);
     }
 
-    @Override
+
     public List<ThrProductsAddDiEntity> filterThrProductsDiLists(FilterThrProductsRequest filterThrProductsRequest) {
         return thrProductsAddDiDao.filterThrProductsDiLists(filterThrProductsRequest);
     }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -9,7 +9,6 @@ import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.res.thrsys.ThrProductsAddDiResponse;
 import com.glxp.api.res.thrsys.ThrProductsResponse;
-import com.glxp.api.service.thrsys.ThrProductsAddDiService;
 import com.glxp.api.service.thrsys.ThrProductsService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -151,9 +151,9 @@
     <select id="filterThrProductsList" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.res.thrsys.ThrProductsAddDiResponse">
         SELECT tdi.*,
-               bc.name        companyName
+               bc.name companyName
         FROM thr_products_add_di tdi
-                 left join basic_corp bc on tdi.customerId = bc.erpId
+                     left join basic_corp bc on tdi.customerId = bc.erpId
         <where>
             <if test="checkStatus != null">
                 AND tdi.status = #{checkStatus}
@@ -171,7 +171,7 @@
                 AND tdi.uuid = #{uuid}
             </if>
             <if test="name != '' and name != null">
-                AND tdi.name like concat('%',#{name},'%')
+                AND tdi.name like concat('%', #{name}, '%')
             </if>
             <if test="spec != '' and spec != null">
                 AND tdi.spec = #{spec}
@@ -196,41 +196,6 @@
         limit 1
     </select>
 
-    <insert id="insert" keyColumn="id" keyProperty="id"
-            parameterType="com.glxp.api.entity.thrsys.ThrProductsAddDiEntity" useGeneratedKeys="true">
-        <!--@mbg.generated-->
-        insert into thr_products_add_di (uuid, customerId, createTime,
-                                         auditTime, remark, auditUser,
-                                         `status`, thirdSysFk, code,
-                                         sptm, ybbm, measname,
-                                         manufactory, spmc, cpms,
-                                         price, selectThridSysStr, basicPrductRemak1,
-                                         basicPrductRemak2, basicPrductRemak3, basicPrductRemak4,
-                                         basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
-                                         basicPrductRemak8, `name`, spec,
-                                         registerNo, cplb, flbm,
-                                         qxlb, tyshxydm, zczbhhzbapzbh,
-                                         ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
-                                         supName, model, `standard`,
-                                         qtbm, zczyxqz, relId, type)
-        values (#{uuid,jdbcType=VARCHAR}, #{customerId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},
-                #{auditTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{auditUser,jdbcType=VARCHAR},
-                #{status,jdbcType=INTEGER}, #{thirdSysFk,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR},
-                #{sptm,jdbcType=VARCHAR}, #{ybbm,jdbcType=VARCHAR}, #{measname,jdbcType=VARCHAR},
-                #{manufactory,jdbcType=VARCHAR}, #{spmc,jdbcType=VARCHAR}, #{cpms,jdbcType=VARCHAR},
-                #{price,jdbcType=VARCHAR}, #{selectThridSysStr,jdbcType=VARCHAR}, #{basicPrductRemak1,jdbcType=VARCHAR},
-                #{basicPrductRemak2,jdbcType=VARCHAR}, #{basicPrductRemak3,jdbcType=VARCHAR},
-                #{basicPrductRemak4,jdbcType=VARCHAR},
-                #{basicPrductRemak5,jdbcType=VARCHAR}, #{basicPrductRemak6,jdbcType=VARCHAR},
-                #{basicPrductRemak7,jdbcType=VARCHAR},
-                #{basicPrductRemak8,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{spec,jdbcType=VARCHAR},
-                #{registerNo,jdbcType=VARCHAR}, #{cplb,jdbcType=VARCHAR}, #{flbm,jdbcType=VARCHAR},
-                #{qxlb,jdbcType=VARCHAR}, #{tyshxydm,jdbcType=VARCHAR}, #{zczbhhzbapzbh,jdbcType=VARCHAR},
-                #{ylqxzcrbarmc,jdbcType=VARCHAR}, #{ylqxzcrbarywmc,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{supName,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR},
-                #{qtbm,jdbcType=VARCHAR}, #{zczyxqz,jdbcType=VARCHAR}, #{relId,jdbcType=VARCHAR},
-                #{type,jdbcType=VARCHAR})
-    </insert>
 
     <select id="filterThrProductsDiList" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.res.thrsys.ThrProductsAddDiResponse">
@@ -247,24 +212,24 @@
                 AND tdi.status = #{status}
             </if>
         </where>
-    </select><select id="filterThrProductsDiLists" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
+    </select>
-                     resultType="com.glxp.api.entity.thrsys.ThrProductsAddDiEntity">
+    <select id="filterThrProductsDiLists" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
-    SELECT tdi.*
+            resultType="com.glxp.api.entity.thrsys.ThrProductsAddDiEntity">
-    FROM thr_products_add_di tdi
+        SELECT tdi.*
-    <where>
+        FROM thr_products_add_di tdi
-        <if test="thirdSysFk != null">
+        <where>
-            AND tdi.thirdSysFk = #{thirdSysFk}
+            <if test="thirdSysFk != null">
-        </if>
+                AND tdi.thirdSysFk = #{thirdSysFk}
-        <if test="code != null">
+            </if>
-            AND tdi.code = #{code}
+            <if test="code != null">
-        </if>
+                AND tdi.code = #{code}
-        <if test="status != null">
+            </if>
-            AND tdi.status = #{status}
+            <if test="status != null">
-        </if>
+                AND tdi.status = #{status}
-        <if test="diType != null">
+            </if>
-            AND  updateTime &lt;= "2023-04-5 00:00:00"
+            <if test="diType != null">
-        </if>
+                AND updateTime &lt;= "2023-04-5 00:00:00"
-    </where>
+            </if>
-</select>
+        </where>
-
+    </select>
 </mapper>