新增配送产品，申请与审核，创建后回填

src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java

@@ -2,6 +2,7 @@ package com.glxp.api.controller.sync;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.res.BaseResponse;
@@ -10,9 +11,16 @@ import com.glxp.api.constant.BusinessType;
 import com.glxp.api.dao.basic.BasicProductsDao;
 import com.glxp.api.dao.basic.CompanyProductRelevanceDao;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
+import com.glxp.api.dao.thrsys.ThrProductsAddDao;
+import com.glxp.api.dao.thrsys.ThrProductsAddDiDao;
+import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
+import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
 import com.glxp.api.req.sync.SpsSyncBasicRlRequest;
 import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.service.basic.UdiProductService;
+import com.glxp.api.service.thrsys.ThrProductsAddService;
+import com.glxp.api.util.IntUtil;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -31,6 +39,9 @@ public class SpsSyncBasicController {
     private final UdiRelevanceDao udiRelevanceDao;
     private final BasicProductsDao basicProductsDao;
     private final CompanyProductRelevanceDao relevanceDao;
+    private final UdiProductService udiProductService;
+    @Resource
+    ThrProductsAddDiDao thrProductsAddDiDao;
 
     @AuthRuleAnnotation("")
     @PostMapping("/spssync/basic/udirl/update")
@@ -41,6 +52,19 @@ public class SpsSyncBasicController {
             return ResultVOUtils.error(500, "缺少唯一标识");
         }
         int b = udiRelevanceDao.updateById(udiRelevanceEntity);
+
+        //入院申请，无DI的数据需更新产品编码
+        if (IntUtil.value(udiRelevanceEntity.getNewNeedUpload())) {
+            UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid());
+            udiProductEntity.setRemark(udiProductEntity.getNameCode());
+            udiProductEntity.setNameCode(udiRelevanceEntity.getMainId());
+            udiProductService.updateUdiInfoByUuid(udiProductEntity);
+            ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity();
+            thrProductsAddDiEntity.setCode(udiProductEntity.getNameCode());
+            thrProductsAddDiEntity.setRemark(udiProductEntity.getRemark());
+            thrProductsAddDiEntity.setStatus(2);
+            thrProductsAddDiDao.update(thrProductsAddDiEntity, new QueryWrapper<ThrProductsAddDiEntity>().eq("code", udiProductEntity.getRemark()));
+        }
         if (b > 0)
             return ResultVOUtils.success("更新成功！");
         else

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

@@ -37,6 +37,7 @@ 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.GennerOrderUtils;
 import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.SupplementVailUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -83,7 +84,8 @@ public class ThrProductsAddDiController {
     SupplementVailUtil supplementVailUtil;
     @Resource
     CustomerService customerService;
-
+    @Resource
+    GennerOrderUtils gennerOrderUtils;
 
     /**
      * 查询DI产品信息列表
@@ -182,18 +184,21 @@ public class ThrProductsAddDiController {
         //自增的数据就再到第三方产品里面
         ThrProductsAddDiResponse thrProductsAddDiResponse = thrProductsAddDiService.selecById(thrProductsAddDiEntity.getId());
 
-        if (status == 2) { //审核通过
+        if (status == 2) {
+            //审核通过
             //第三方产品审核通过
             if (thrProductsAddDiEntity.getType() == 2) {
-                ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
-                BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity);
-                thrProductsService.insertThrProducts(thrProductsEntity);
+//                    ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
+//                    BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity);
+//                    thrProductsService.insertThrProducts(thrProductsEntity);
+                thrProductsAddDiEntity.setCode(gennerOrderUtils.getRelId() + "x");
                 ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys();
                 if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk()))
                     if (!udiContrastService.isExit(null, thrProductsAddDiEntity.getCode(), null)) {
-                        udiContrastService.createOnlyMainId(thrProductsAddDiEntity.getCode());
+                        udiContrastService.createOnlyApply(thrProductsAddDiEntity);
+                        thrProductsAddDiEntity.setStatus(4);
+                        thrProductsAddDiService.updateById(thrProductsAddDiEntity);
                     }
-
             } else {   //选入DI信息审核通过
                 //审核通过后追加到耗材字典中
                 UdiCombineRequest combineRequest = new UdiCombineRequest();
@@ -260,10 +265,11 @@ public class ThrProductsAddDiController {
                         }
                     }
                 }
-            }
                 thrProductsAddDiEntity.setRemark(remark);
                 thrProductsAddDiEntity.setStatus(status);
                 thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity);
+            }
+
         } else {
             thrProductsAddDiEntity.setRemark(remark);
             thrProductsAddDiEntity.setStatus(status);
@@ -317,19 +323,14 @@ public class ThrProductsAddDiController {
     public BaseResponse saveProduct(@RequestBody ThrProductsAddDiEntity thrProductsAdddiEntity) {
         if (null == thrProductsAdddiEntity)
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
-
-
+        String customerId = getCustomerId() + "";
+        if (customerId.equals("110")) {
             if (thrProductsService.isExit(thrProductsAdddiEntity.getCode(), thrProductsAdddiEntity.getThirdSysFk())) {
                 return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！");
             }
-
-
-        String customerId = getCustomerId() + "";
-        if (customerId.equals("110")) {
             ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
             BeanUtil.copyProperties(thrProductsAdddiEntity, thrProductsEntity);
             thrProductsService.insertThrProducts(thrProductsEntity);
-
         } else {
             if (StrUtil.isEmpty(thrProductsAdddiEntity.getThirdSysFk())) {
                 thrProductsAdddiEntity.setThirdSysFk("thirdId");
@@ -386,13 +387,16 @@ public class ThrProductsAddDiController {
             if (thrProductsAddDiEntity.getStatus() == 2) { //审核通过
                 //第三方产品审核通过
                 if (thrProductsAddDiEntity.getType() == 2) {
-                    ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
-                    BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity);
-                    thrProductsService.insertThrProducts(thrProductsEntity);
+//                    ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
+//                    BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity);
+//                    thrProductsService.insertThrProducts(thrProductsEntity);
+                    thrProductsAddDiEntity.setCode(gennerOrderUtils.getRelId() + "");
                     ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys();
                     if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk()))
                         if (!udiContrastService.isExit(null, thrProductsAddDiEntity.getCode(), null)) {
-                            udiContrastService.createOnlyMainId(thrProductsAddDiEntity.getCode());
+                            udiContrastService.createOnlyApply(thrProductsAddDiEntity);
+                            thrProductsAddDiEntity.setStatus(4);
+                            thrProductsAddDiService.updateById(thrProductsAddDiEntity);
                         }
 
                 } else {   //选入DI信息审核通过

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

@@ -1,6 +1,8 @@
 package com.glxp.api.dao.thrsys;
 
 
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.thrsys.ThrDeptEntity;
 import com.glxp.api.entity.thrsys.ThrProductsAddEntity;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -9,13 +11,12 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface ThrProductsAddDao {
+public interface ThrProductsAddDao extends BaseMapperPlus<ThrProductsAddDao, ThrProductsAddEntity, ThrProductsAddEntity> {
 
     List<ThrProductsAddEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest);
 
     List<ThrProductsAddEntity> batchSelectByIds(FilterThrProductsRequest filterThrProductsRequest);
 
-    ThrProductsAddEntity selectById(@Param("id") String id);
 
     List<ThrProductsAddEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest);
 
@@ -25,7 +26,6 @@ public interface ThrProductsAddDao {
 
     boolean updateThrProducts(ThrProductsAddEntity thrProductsEntity);
 
-    boolean deleteById(@Param("id") String id);
 
     boolean deleteAll();
 

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -105,4 +105,5 @@ public class UdiProductEntity {
      * 产品分类高值 ：1：高值耗材；2.普通耗材
      */
     private Integer hcType;
+    private String remark;
 }

src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java

@@ -188,5 +188,10 @@ public class UdiRelevanceEntity {
 
     @TableField(value = "certIdFk")
     private String certIdFk;
+    /**
+     * 系统新增需要上传
+     */
+    @TableField(value = "newNeedUpload")
+    private Boolean newNeedUpload;
 
 }

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

@@ -64,7 +64,7 @@ public class ThrProductsAddDiEntity {
     private String auditUser;
 
     /**
-     * 审核状态
+     * 审核状态    1: '未审核' 2: '已审核', 3: '未通过',4.审核通过未创建
      */
     @TableField(value = "`status`")
     @ApiModelProperty(value = "审核状态")

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -1,5 +1,6 @@
 package com.glxp.api.res.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -137,6 +138,12 @@ public class UdiRelevanceResponse {
     private String categoryName;
     private String cphhhbh;
 
+    /**
+     * 系统新增需要上传
+     */
+    private Boolean newNeedUpload;
+
+
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
             return 1;

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -7,6 +7,7 @@ import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
+import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.http.NmpaUdiClient;
 import com.glxp.api.req.basic.UdiCombineRequest;
@@ -198,7 +199,7 @@ public class UdiContrastService {
         udiRelevanceEntity.setUuid(CustomUtil.getUUId());
         udiRelevanceEntity.setSupName(thrProductsEntity.getSupName());
         udiRelevanceEntity.setId(gennerOrderUtils.getRelId());
-        udiRelevanceEntity.setIsDisable(false);
+        udiRelevanceEntity.setIsDisable(true);
         udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
         BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
@@ -211,9 +212,41 @@ public class UdiContrastService {
         udiProductEntity.setUuid(udiRelevanceEntity.getUuid());
         udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
         udiProductEntity.setDiType(1);
-        udiProductEntity.setScbssfbhph("是");
-        udiProductEntity.setScbssfbhscrq("是");
-        udiProductEntity.setScbssfbhsxrq("是");
+        udiProductEntity.setScbssfbhph("否");
+        udiProductEntity.setScbssfbhscrq("否");
+        udiProductEntity.setScbssfbhsxrq("否");
+        udiProductEntity.setScbssfbhxlh("否");
+        udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
+        udiProductService.insertUdiInfo(udiProductEntity);
+    }
+
+
+    public void createOnlyApply(ThrProductsAddDiEntity thrProductsAddDiEntity) {
+        UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+        udiRelevanceEntity.setThirdId(thrProductsAddDiEntity.getCode());
+        udiRelevanceEntity.setMainId(thrProductsAddDiEntity.getCode());
+        udiRelevanceEntity.setUpdateTime(new Date());
+        udiRelevanceEntity.setModifyTime(new Date());
+        udiRelevanceEntity.setUuid(CustomUtil.getUUId());
+        udiRelevanceEntity.setSupName(thrProductsAddDiEntity.getSupName());
+        udiRelevanceEntity.setId(gennerOrderUtils.getRelId());
+        udiRelevanceEntity.setIsDisable(true);
+        udiRelevanceEntity.setNewNeedUpload(true);
+        udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
+        UdiProductEntity udiProductEntity = new UdiProductEntity();
+        BeanUtils.copyProperties(thrProductsAddDiEntity, udiProductEntity);
+        udiProductEntity.setNameCode(thrProductsAddDiEntity.getCode());
+        udiProductEntity.setCpmctymc(thrProductsAddDiEntity.getName());
+        udiProductEntity.setManufactory(thrProductsAddDiEntity.getManufactory());
+        udiProductEntity.setYlqxzcrbarmc(thrProductsAddDiEntity.getManufactory());
+        udiProductEntity.setGgxh(thrProductsAddDiEntity.getSpec());
+        udiProductEntity.setZczbhhzbapzbh(thrProductsAddDiEntity.getRegisterNo());
+        udiProductEntity.setUuid(udiRelevanceEntity.getUuid());
+        udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+        udiProductEntity.setDiType(1);
+        udiProductEntity.setScbssfbhph("否");
+        udiProductEntity.setScbssfbhscrq("否");
+        udiProductEntity.setScbssfbhsxrq("否");
         udiProductEntity.setScbssfbhxlh("否");
         udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
         udiProductService.insertUdiInfo(udiProductEntity);

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

@@ -68,7 +68,7 @@ public class ThrProductsAddServiceImpl implements ThrProductsAddService {
 
     @Override
     public boolean deleteById(String id) {
-        return thrProductsAddDao.deleteById(id);
+        return thrProductsAddDao.deleteById(id) > 0;
     }
 
     @Override

src/main/resources/mybatis/mapper/basic/UdiProductDao.xml

@@ -706,6 +706,10 @@
             <if test="categoryName != null">
                 categoryName=#{categoryName},
             </if>
+
+            <if test="remark != null">
+                remark=#{remark},
+            </if>
         </trim>
         where uuid = #{uuid}
     </update>

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -962,10 +962,11 @@
                 INTO basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence, purType, attributeType,hcType,useMuti, useNum, supName, createTime, updateTime, modifyTime,
+                 lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime,
+                 updateTime, modifyTime,
                  createUser,
                  updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert)
+                 remark, useExpireTime, dispatch, groupBuy, needCert, newNeedUpload)
         values (#{id},
                 #{uuid},
                 #{mainId},
@@ -979,7 +980,7 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence}, #{purType},#{attributeType},#{hcType},
+                #{isAdavence}, #{purType}, #{attributeType}, #{hcType},
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -988,7 +989,7 @@
                 #{modifyTime},
                 #{createUser},
                 #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
+                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{newNeedUpload})
     </insert>
 
     <insert id="insertUdiRelevanceignore" keyProperty="id"
@@ -998,7 +999,8 @@
         INTO basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence, purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+                 lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime,
+                 updateTime, modifyTime,
                  createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
@@ -1015,7 +1017,7 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence}, #{purType},#{attributeType},#{hcType},
+                #{isAdavence}, #{purType}, #{attributeType}, #{hcType},
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -1178,7 +1180,8 @@
                 into basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence, purType, attributeType,hcType,useMuti, useNum, supName, createTime, updateTime, modifyTime,
+                 lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime,
+                 updateTime, modifyTime,
                  createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
@@ -1198,7 +1201,7 @@
              #{item.isDisable},
              #{item.isLock},
              #{item.lockStatus},
-             #{item.isAdavence}, #{item.purType},#{item.attributeType},#{item.hcType},
+             #{item.isAdavence}, #{item.purType}, #{item.attributeType}, #{item.hcType},
              #{item.useMuti},
              #{item.useNum},
              #{item.supName},

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

@@ -97,12 +97,6 @@
     </select>
 
 
-    <select id="selectById" parameterType="Map" resultType="com.glxp.api.entity.thrsys.ThrProductsAddEntity">
-        select *
-        FROM thr_products_add
-        WHERE id = #{id}
-    </select>
-
     <insert id="insertThrProducts" keyProperty="id"
             parameterType="com.glxp.api.entity.thrsys.ThrProductsAddEntity">
         replace
@@ -163,11 +157,6 @@
         </foreach>
     </insert>
 
-    <delete id="deleteById" parameterType="Map">
-        DELETE
-        FROM thr_products_add
-        WHERE id = #{id}
-    </delete>
 
     <update id="updateThrProducts" parameterType="com.glxp.api.entity.thrsys.ThrProductsAddEntity">
         UPDATE thr_products_add

src/main/resources/schemas/schema_v2.3.sql

@@ -735,9 +735,14 @@ INSERT ignore INTO sys_param_config(`id`, `parentId`, `paramName`, `paramKey`, `
 VALUES (20090, 0, '资质证书近效期预警', 'cert_near_warn', '15', 1, 0, '资质证书近效期预警(单位：天)', NULL);
 
 
-INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`)
-VALUES (38032, 16, '1', 1, 'auditTime', '审核时间', 'text', '', NULL, '', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-
+INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
+                                            `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (38032, 16, '1', 1, 'auditTime', '审核时间', 'text', '', NULL, '', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 
 
+CALL Pro_Temp_ColumnWork('basic_udirel', 'newNeedUpload', 'tinyint NULL DEFAULT NULL COMMENT ''是否系统新增产品需要上传''', 1);