首营资质同步问题解决

api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java

@@ -171,7 +171,17 @@ public class SpsSyncExportStatusController {
                     && CollUtil.isEmpty(syncDataResponse.getThrOrderDetailEntities())
                     && CollUtil.isEmpty(syncDataResponse.getCompanyProductRelevanceEntities())
                     && CollUtil.isEmpty(syncDataResponse.getUdiRelevanceEntities())
-                    && CollUtil.isEmpty(syncDataResponse.getAuthAdminList())) {
+                    && CollUtil.isEmpty(syncDataResponse.getAuthAdminList())
+                    && CollUtil.isEmpty(syncDataResponse.getDeptEntityList())
+                    && CollUtil.isEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())
+                    && CollUtil.isEmpty(syncDataResponse.getWarehouseUserEntities())
+                    && CollUtil.isEmpty(syncDataResponse.getInvSubWarehouseEntities())
+                    && CollUtil.isEmpty(syncDataResponse.getSupCompanyEntities())
+                    && CollUtil.isEmpty(syncDataResponse.getSupManufacturerEntities())
+                    && CollUtil.isEmpty(syncDataResponse.getSupProductEntities())
+                    && CollUtil.isEmpty(syncDataResponse.getSupCertEntities())
+                    && CollUtil.isEmpty(syncDataResponse.getSupCertSetEntities())
+            ) {
                 //数据不记录日志
                 return ResultVOUtils.error(500, "当前暂无更新数据需要同步");
             }

api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertSetDao.java

@@ -16,4 +16,6 @@ public interface SupCertSetDao {
     boolean updateCertSet(SupCertSetEntity supCertSetEntity);
 
     boolean deleteById(String id);
+
+    boolean deleteAll();
 }

api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupCertSetEntity.java

@@ -21,9 +21,7 @@ public class SupCertSetEntity {
     private String remark;
     private Date updateTime;
     private Integer type;
-
     private List<String> flbmList;
-
     private boolean isPass;
 
     public List<String> getFlbmList() {

api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterCertSetsRequest.java

@@ -10,5 +10,7 @@ public class FilterCertSetsRequest extends ListPageRequest {
     private Integer type;
     private Integer need;
 
+    private String lastUpdateTime;
+
 
 }

api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java

@@ -8,10 +8,7 @@ import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
 import com.glxp.api.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
-import com.glxp.api.admin.entity.purchase.SupCertEntity;
+import com.glxp.api.admin.entity.purchase.*;
-import com.glxp.api.admin.entity.purchase.SupCompanyEntity;
-import com.glxp.api.admin.entity.purchase.SupManufacturerEntity;
-import com.glxp.api.admin.entity.purchase.SupProductEntity;
 import com.glxp.api.admin.entity.thrsys.*;
 import lombok.Data;
 
@@ -55,5 +52,6 @@ public class SpsSyncDataResponse {
     List<SupManufacturerEntity> supManufacturerEntities;
     List<SupProductEntity> supProductEntities;
     List<SupCertEntity> supCertEntities;
+    List<SupCertSetResponse> supCertSetEntities;
 
 }

api-admin/src/main/java/com/glxp/api/admin/res/basic/SupCertSetResponse.java

@@ -0,0 +1,22 @@
+package com.glxp.api.admin.res.basic;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SupCertSetResponse {
+    private Integer id;
+    private String name;
+    private boolean need;
+    private Integer foreign;
+    private String cplx;
+    private String hchzsb;
+    private String flbm;
+    private Integer imports;
+    private String remark;
+    private Date updateTime;
+    private Integer type;
+    private boolean isPass;
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertSetService.java

@@ -17,4 +17,6 @@ public interface SupCertSetService {
 
     boolean deleteById(String id);
 
+    boolean deleteAll();
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java

@@ -24,6 +24,5 @@ public interface SupCompanyService {
 
     boolean insertCompany(SupCompanyEntity companyEntity);
 
-
     boolean deleteCompany(Long customerId);
 }

api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertSetServiceImpl.java

@@ -45,4 +45,9 @@ public class SupCertSetServiceImpl implements SupCertSetService {
     public boolean deleteById(String id) {
         return supCertSetDao.deleteById(id);
     }
+
+    @Override
+    public boolean deleteAll() {
+        return supCertSetDao.deleteAll();
+    }
 }

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

@@ -29,28 +29,20 @@ import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
 import com.glxp.api.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
-import com.glxp.api.admin.entity.purchase.SupCertEntity;
+import com.glxp.api.admin.entity.purchase.*;
-import com.glxp.api.admin.entity.purchase.SupCompanyEntity;
-import com.glxp.api.admin.entity.purchase.SupManufacturerEntity;
-import com.glxp.api.admin.entity.purchase.SupProductEntity;
 import com.glxp.api.admin.entity.thrsys.*;
 import com.glxp.api.admin.httpclient.SpGetHttpClient;
 import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
+import com.glxp.api.admin.req.purchase.FilterCertSetsRequest;
 import com.glxp.api.admin.req.sync.PostDownloadInfo;
-import com.glxp.api.admin.res.basic.SpSyncUdiResponse;
+import com.glxp.api.admin.res.basic.*;
-import com.glxp.api.admin.res.basic.SpsSyncBusResponse;
-import com.glxp.api.admin.res.basic.SpsSyncDataResponse;
-import com.glxp.api.admin.res.basic.SpsSyncOrderResponse;
 import com.glxp.api.admin.service.auth.DeptService;
 import com.glxp.api.admin.service.basic.*;
 import com.glxp.api.admin.service.inout.OrderService;
 import com.glxp.api.admin.service.inventory.InvBusUserService;
 import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
-import com.glxp.api.admin.service.purchase.SupCertService;
+import com.glxp.api.admin.service.purchase.*;
-import com.glxp.api.admin.service.purchase.SupCompanyService;
-import com.glxp.api.admin.service.purchase.SupManufacturerService;
-import com.glxp.api.admin.service.purchase.SupProductService;
 import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService;
 import com.glxp.api.admin.util.CustomUtil;
 import com.glxp.api.admin.util.DateUtil;
@@ -130,6 +122,8 @@ public class DlBasicService {
     SupProductService supProductService;
     @Resource
     SupCertService supCertService;
+    @Resource
+    SupCertSetService supCertSetService;
 
 
     private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class);
@@ -149,7 +143,6 @@ public class DlBasicService {
 
                     if (response.getCode() == 20000 && response.getData() != null) {
                         SpsSyncDataResponse syncDataResponse = response.getData();
-
                         //构造下载记录
                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
                         basicDownloadStatusEntity.setId(CustomUtil.getId());
@@ -385,6 +378,8 @@ public class DlBasicService {
                                 supCompanyEntity.setUpdateTime(null);
                                 supCompanyService.insertCompany(supCompanyEntity);
                             }
+
+                            remark.append("配送企业证书：").append(syncDataResponse.getSupCompanyEntities().size()).append("条\n");
                         }
 
                         //生产企业首营资质
@@ -394,6 +389,7 @@ public class DlBasicService {
                                 supManufacturerEntity.setUpdateTime(null);
                                 supManufacturerService.insertCompany(supManufacturerEntity);
                             }
+                            remark.append("生产企业证书：").append(syncDataResponse.getSupManufacturerEntities().size()).append("条\n");
                         }
 
 
@@ -404,6 +400,7 @@ public class DlBasicService {
                                 supProductEntity.setUpdateTime(null);
                                 supProductService.insertRegistration(supProductEntity);
                             }
+                            remark.append("产品资质证书：").append(syncDataResponse.getSupProductEntities().size()).append("条\n");
                         }
 
                         //所有证书提交
@@ -411,6 +408,21 @@ public class DlBasicService {
                             for (SupCertEntity supCertEntity : syncDataResponse.getSupCertEntities()) {
                                 supCertService.insertCompanyCert(supCertEntity);
                             }
+                            remark.append("相关证书总数：").append(syncDataResponse.getSupCertEntities().size()).append("条\n");
+
+                        }
+
+
+                        //资质证书设置
+                        if (CollUtil.isNotEmpty(syncDataResponse.getSupCertSetEntities())) {
+                            List<SupCertSetEntity> backs = supCertSetService.filterCertSets(new FilterCertSetsRequest());
+                            supCertSetService.deleteAll();
+                            for (SupCertSetResponse supCertSetResponse : syncDataResponse.getSupCertSetEntities()) {
+                                SupCertSetEntity supCertSetEntity = new SupCertSetEntity();
+                                BeanUtils.copyProperties(supCertSetResponse, supCertSetEntity);
+                                supCertSetService.insertCertSet(supCertSetEntity);
+                            }
+                            remark.append("证书设置：").append(syncDataResponse.getSupCertSetEntities().size()).append("条\n");
                         }
 
                         spGetHttp.postBasicStatus(basicExportStatusEntity.getId());

api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java

@@ -190,7 +190,9 @@ public class HeartService {
                 && CollUtil.isEmpty(syncDataResponse.getSupCompanyEntities())
                 && CollUtil.isEmpty(syncDataResponse.getSupManufacturerEntities())
                 && CollUtil.isEmpty(syncDataResponse.getSupProductEntities())
-                && CollUtil.isEmpty(syncDataResponse.getSupCertEntities())) {
+                && CollUtil.isEmpty(syncDataResponse.getSupCertEntities())
+                && CollUtil.isEmpty(syncDataResponse.getSupCertSetEntities())
+        ) {
             //数据不记录日志
             return ResultVOUtils.success("无数据");
         }
@@ -266,6 +268,8 @@ public class HeartService {
             logs = logs + "产品资质证书：" + syncDataResponse.getSupProductEntities().size() + "条\n";
         if (CollUtil.isNotEmpty(syncDataResponse.getSupCertEntities()))
             logs = logs + "相关资质证书总数：" + syncDataResponse.getSupCertEntities().size() + "条\n";
+        if (CollUtil.isNotEmpty(syncDataResponse.getSupCertSetEntities()))
+            logs = logs + "证书设置：" + syncDataResponse.getSupCertEntities().size() + "条\n";
         basicExportStatusEntity3.setRemark(logs);
         basicExportStatusEntity3.setUpdateTime(new Date());
         basicExportService.updateExportStatus(basicExportStatusEntity3);

api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java

@@ -14,10 +14,7 @@ import com.glxp.api.admin.entity.inout.*;
 import com.glxp.api.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
-import com.glxp.api.admin.entity.purchase.SupCertEntity;
+import com.glxp.api.admin.entity.purchase.*;
-import com.glxp.api.admin.entity.purchase.SupCompanyEntity;
-import com.glxp.api.admin.entity.purchase.SupManufacturerEntity;
-import com.glxp.api.admin.entity.purchase.SupProductEntity;
 import com.glxp.api.admin.entity.thrsys.*;
 import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
 import com.glxp.api.admin.req.auth.FilterDeptRequest;
@@ -26,6 +23,7 @@ import com.glxp.api.admin.req.inout.OrderFilterRequest;
 import com.glxp.api.admin.req.inout.OrderQueryRequest;
 import com.glxp.api.admin.req.inventory.FilterInvUserRequest;
 import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
+import com.glxp.api.admin.req.purchase.FilterCertSetsRequest;
 import com.glxp.api.admin.req.purchase.FilterPoductRequest;
 import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest;
 import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest;
@@ -34,6 +32,7 @@ import com.glxp.api.admin.req.thrsys.*;
 import com.glxp.api.admin.res.basic.SpsSyncBusResponse;
 import com.glxp.api.admin.res.basic.SpsSyncDataResponse;
 import com.glxp.api.admin.res.basic.SpsSyncOrderResponse;
+import com.glxp.api.admin.res.basic.SupCertSetResponse;
 import com.glxp.api.admin.res.info.SyncDataSetResponse;
 import com.glxp.api.admin.service.auth.AuthAdminService;
 import com.glxp.api.admin.service.auth.DeptService;
@@ -44,17 +43,16 @@ import com.glxp.api.admin.service.inout.*;
 import com.glxp.api.admin.service.inventory.InvBusUserService;
 import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
-import com.glxp.api.admin.service.purchase.SupCertService;
+import com.glxp.api.admin.service.purchase.*;
-import com.glxp.api.admin.service.purchase.SupCompanyService;
-import com.glxp.api.admin.service.purchase.SupManufacturerService;
-import com.glxp.api.admin.service.purchase.SupProductService;
 import com.glxp.api.admin.service.thrsys.*;
+import groovy.transform.WithReadLock;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class UpBasicService {
@@ -107,6 +105,8 @@ public class UpBasicService {
     SupProductService supProductService;
     @Resource
     SupCertService supCertService;
+    @Resource
+    SupCertSetService supCertSetService;
 
     public SpsSyncDataResponse upAllData(SpsSyncDataRequest spsSyncDataRequest) {
         SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse();
@@ -280,56 +280,78 @@ public class UpBasicService {
         //资质证书
         List<SupCertEntity> supCertEntityList = new ArrayList<>();
 
-        //获取供应商资质证书
+
-        FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest();
+        if (syncDataSetEntity.isCompanyCert()) {
-        BeanUtils.copyProperties(spsSyncDataRequest, filterSupCompanyRequest);
+
-        filterSupCompanyRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
+            //获取供应商资质证书
-        List<SupCompanyEntity> supCompanyEntities = supCompanyService.filterCompany(filterSupCompanyRequest);
+            FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest();
-        syncDataResponse.setSupCompanyEntities(supCompanyEntities);
+            BeanUtils.copyProperties(spsSyncDataRequest, filterSupCompanyRequest);
-        if (CollUtil.isNotEmpty(supCompanyEntities)) {
+            filterSupCompanyRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
-            for (SupCompanyEntity supCompanyEntity : supCompanyEntities) {
+            List<SupCompanyEntity> supCompanyEntities = supCompanyService.filterCompany(filterSupCompanyRequest);
-                List<SupCertEntity> tempsList = supCertService.findAll(supCompanyEntity.getCustomerId());
+            syncDataResponse.setSupCompanyEntities(supCompanyEntities);
-                if (CollUtil.isNotEmpty(tempsList)) {
+            if (CollUtil.isNotEmpty(supCompanyEntities)) {
-                    supCertEntityList.addAll(tempsList);
+                for (SupCompanyEntity supCompanyEntity : supCompanyEntities) {
+                    List<SupCertEntity> tempsList = supCertService.findAll(supCompanyEntity.getCustomerId());
+                    if (CollUtil.isNotEmpty(tempsList)) {
+                        supCertEntityList.addAll(tempsList);
+                    }
                 }
             }
         }
 
 
-        //获取生产企业资质证书
+        if (syncDataSetEntity.isManufacturerCert()) {
-        FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest();
+            //获取生产企业资质证书
-        BeanUtils.copyProperties(spsSyncDataRequest, filterSupManufacturerRequest);
+            FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest();
-        filterSupManufacturerRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
+            BeanUtils.copyProperties(spsSyncDataRequest, filterSupManufacturerRequest);
-        List<SupManufacturerEntity> supManufacturerEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
+            filterSupManufacturerRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
-        syncDataResponse.setSupManufacturerEntities(supManufacturerEntities);
+            List<SupManufacturerEntity> supManufacturerEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
-        if (CollUtil.isNotEmpty(supManufacturerEntities)) {
+            syncDataResponse.setSupManufacturerEntities(supManufacturerEntities);
-            for (SupManufacturerEntity supManufacturerEntity : supManufacturerEntities) {
+            if (CollUtil.isNotEmpty(supManufacturerEntities)) {
-                List<SupCertEntity> tempsList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
+                for (SupManufacturerEntity supManufacturerEntity : supManufacturerEntities) {
-                if (CollUtil.isNotEmpty(tempsList)) {
+                    List<SupCertEntity> tempsList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
-                    supCertEntityList.addAll(tempsList);
+                    if (CollUtil.isNotEmpty(tempsList)) {
+                        supCertEntityList.addAll(tempsList);
+                    }
                 }
             }
         }
 
-
+        if (syncDataSetEntity.isProductCert()) {
-        //获取产品资质证书
+            //获取产品资质证书
-        FilterPoductRequest filterPoductRequest = new FilterPoductRequest();
+            FilterPoductRequest filterPoductRequest = new FilterPoductRequest();
-        BeanUtils.copyProperties(spsSyncDataRequest, filterPoductRequest);
+            BeanUtils.copyProperties(spsSyncDataRequest, filterPoductRequest);
-        filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
+            filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
-        List<SupProductEntity> supProductEntities = supProductService.filterProducts(filterPoductRequest);
+            List<SupProductEntity> supProductEntities = supProductService.filterProducts(filterPoductRequest);
-        syncDataResponse.setSupProductEntities(supProductEntities);
+            syncDataResponse.setSupProductEntities(supProductEntities);
-
+
-        if (CollUtil.isNotEmpty(supProductEntities)) {
+            if (CollUtil.isNotEmpty(supProductEntities)) {
-            for (SupProductEntity supProductEntity : supProductEntities) {
+                for (SupProductEntity supProductEntity : supProductEntities) {
-                List<SupCertEntity> tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
+                    List<SupCertEntity> tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
-                if (CollUtil.isNotEmpty(tempsList)) {
+                    if (CollUtil.isNotEmpty(tempsList)) {
-                    supCertEntityList.addAll(tempsList);
+                        supCertEntityList.addAll(tempsList);
+                    }
                 }
             }
+            syncDataResponse.setSupCertEntities(supCertEntityList);
         }
-        syncDataResponse.setSupCertEntities(supCertEntityList);
 
 
+        //企业证书设置
+        FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
+        BeanUtils.copyProperties(spsSyncDataRequest, filterCertSetsRequest);
+        List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
+        if (CollUtil.isNotEmpty(supCertSetEntities)) {
+            List<SupCertSetEntity> temps = supCertSetService.filterCertSets(new FilterCertSetsRequest());
+            List<SupCertSetResponse> supCertSetResponses = temps.stream().map(item ->
+            {
+                SupCertSetResponse supCertSetResponse = new SupCertSetResponse();
+                BeanUtils.copyProperties(item, supCertSetResponse);
+                return supCertSetResponse;
+            }).collect(Collectors.toList());
+            syncDataResponse.setSupCertSetEntities(supCertSetResponses);
+        }
+
         return syncDataResponse;
     }
 

api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml

@@ -16,7 +16,9 @@
             <if test="need!=null">
                 and `need` = #{need}
             </if>
-
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
         </where>
         ORDER BY id DESC
     </select>
@@ -60,5 +62,8 @@
                 #{imports}, #{type})
     </insert>
 
-
+    <delete id="deleteAll">
+        DELETE
+        FROM sup_cert_set
+    </delete>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml

@@ -102,7 +102,7 @@
     </update>
 
     <insert id="insertCompany" parameterType="com.glxp.api.admin.entity.purchase.SupManufacturerEntity">
-        INSERT INTO sup_manufacturer(companyName, creditCode, companyType,
+        replace INTO sup_manufacturer(companyName, creditCode, companyType,
                                      placeArea, placeAreaCode, placeAddress,
                                      legalPersonName, legalPersonPapersType, legalPersonPapersCode,
                                      productionArea, productionAreaCode, productionAddress,
@@ -128,8 +128,8 @@
 
     <select id="getCompanyByNameAndCode" parameterType="com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest"
             resultType="com.glxp.api.admin.entity.purchase.SupManufacturerEntity">
-        SELECT sup_manufacturer.* ,company.companyName as supName FROM sup_manufacturer
+        SELECT sup_manufacturer.* ,sup_company.companyName as supName FROM sup_manufacturer
-        inner join company on sup_manufacturer.customerId = company.customerId
+        inner join sup_company on sup_manufacturer.customerId = sup_company.customerId
         <where>
             <if test="companyName != null and companyName != ''">
                 and sup_manufacturer.companyName = #{companyName}

api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml

@@ -170,7 +170,8 @@
     </update>
 
     <insert id="insertRegistration" parameterType="com.glxp.api.admin.entity.purchase.SupProductEntity">
-        INSERT INTO sup_product(enterpriseId, recordCode, recordProductName,
+        replace
+        INTO sup_product(enterpriseId, recordCode, recordProductName,
                                 productManageType, recordPeopleName, recordPeopleArea,
                                 recordPeopleAreaCode, recordPeopleAddress, productType,
                                 productDirectoryCode, agentName, agentArea,
@@ -181,17 +182,48 @@
                                 other, filePath, remark,
                                 createTime, updateTime, manufacturerIdFk, customerId, productId
             , auditStatus, auditComment, sptm, ybbm, measname, cpms, hchzsb)
-        values (#{enterpriseId}, #{recordCode}, #{recordProductName},
+        values (
-                #{productManageType}, #{recordPeopleName}, #{recordPeopleArea},
+        #{enterpriseId},
-                #{recordPeopleAreaCode}, #{recordPeopleAddress}, #{productType},
+        #{recordCode},
-                #{productDirectoryCode}, #{agentName}, #{agentArea},
+        #{recordProductName},
-                #{agentAreaCode}, #{agentAddress}, #{instructions},
+        #{productManageType},
-                #{productAddress}, #{recordText}, #{placeOrigin},
+        #{recordPeopleName},
-                #{productionRegion}, #{productionCompanyName}, #{afterSale},
+        #{recordPeopleArea},
-                #{specification}, #{structure}, #{scope},
+        #{recordPeopleAreaCode},
-                #{other}, #{filePath}, #{remark},
+        #{recordPeopleAddress},
-                #{createTime}, #{updateTime}, #{manufacturerIdFk}, #{customerId}, #{productId}
+        #{productType},
-                   , #{auditStatus}, #{auditComment}, #{sptm}, #{ybbm}, #{measname}, #{cpms}, #{hchzsb})
+        #{productDirectoryCode},
+        #{agentName},
+        #{agentArea},
+        #{agentAreaCode},
+        #{agentAddress},
+        #{instructions},
+        #{productAddress},
+        #{recordText},
+        #{placeOrigin},
+        #{productionRegion},
+        #{productionCompanyName},
+        #{afterSale},
+        #{specification},
+        #{structure},
+        #{scope},
+        #{other},
+        #{filePath},
+        #{remark},
+        #{createTime},
+        #{updateTime},
+        #{manufacturerIdFk},
+        #{customerId},
+        #{productId}
+        ,
+        #{auditStatus},
+        #{auditComment},
+        #{sptm},
+        #{ybbm},
+        #{measname},
+        #{cpms},
+        #{hchzsb}
+        )
     </insert>
 
     <delete id="deleteById" parameterType="Map">

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -1,14 +1,27 @@
-
 -- 字段新增   （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
 CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
-CALL Pro_Temp_ColumnWork ('pur_plan','billType','varchar(255) ', 2);
 
+CALL Pro_Temp_ColumnWork ('sup_cert','filePath','varchar(255) ', 2);
+
+INSERT
+ignore INTO   sys_scheduled(id, cronName, cron, customerId, remark)
+VALUES
+(16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据');
+
+INSERT
+ignore INTO sys_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain )
+VALUES
+ ( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' );
 
+
+INSERT
+ignore INTO sys_scheduled (`cronName`, `cron`, `customerId`, `remark`) VALUES ('downloadSpDataTask', '0 0/1 * * * ?', NULL, '立即下载自助平台数据');
 ALTER TABLE pur_plan
     MODIFY COLUMN `billType` varchar(255) NULL DEFAULT NULL COMMENT '申购类型' AFTER `status`;
 
+
 -- 创建表时必须  create table if not exists 表名
 
 -- 删除自助平台表