Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
#	src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

src/main/java/com/glxp/api/aspect/AuthorizeAspect.java

@@ -8,6 +8,7 @@ import com.glxp.api.exception.JsonException;
 import com.glxp.api.util.JwtUtils;
 import com.glxp.api.common.enums.ResultEnum;
 import io.jsonwebtoken.Claims;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
@@ -28,10 +29,11 @@ import java.lang.reflect.Method;
 @Aspect
 @Component
 @Slf4j
+@RequiredArgsConstructor
 public class AuthorizeAspect {
 
-    @Resource
+
-    private AuthLicenseDao authLicenseDao;
+    private final AuthLicenseDao authLicenseDao;
 
     @Pointcut("@annotation(com.glxp.api.annotation.AuthRuleAnnotation)")
     public void adminLoginVerify() {

src/main/java/com/glxp/api/constant/BasicExportStatusEnum.java

@@ -0,0 +1,35 @@
+package com.glxp.api.constant;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum BasicExportStatusEnum {
+
+    /**
+     * 任务待触发
+     */
+    WAIT_TRIGGERED(1, "任务待触发"),
+
+    /**
+     * 文件待生成
+     */
+    WAIT_BUILT(2, "文件待生成"),
+
+    /**
+     * 文件待同步
+     */
+    WAIT_SYNC(3, "文件待同步"),
+
+    /**
+     * 任务完成
+     */
+    COMPLETED(4, "任务完成"),
+    ;
+    @EnumValue
+    private Integer code;
+
+    private String remark;
+}

src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java

@@ -0,0 +1,36 @@
+package com.glxp.api.constant;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Value;
+
+@Getter
+@AllArgsConstructor
+public enum BasicExportStatusTimeEnum {
+
+    /**
+     * 耗材字典
+     */
+    BASIC_PRODUCTS("basic_products", "耗材字典"),
+
+    /**
+     * 往来单位字典
+     */
+    BASIC_CORP("basic_corp", "往来单位字典"),
+
+    /**
+     * 国家库DI数据
+     */
+    DB_DI_PRODUCTS("db_di_products", "国家库DI数据"),
+
+    /**
+     * 首营资质
+     */
+    SUP_CERT("sup_cert", "首营资质"),
+    ;
+    @EnumValue
+    private String key;
+
+    private String remark;
+}

src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java

@@ -0,0 +1,20 @@
+package com.glxp.api.constant;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum BasicExportTypeEnum {
+
+    /**
+     * 基础数据
+     */
+    BASIC_DATA("basic_data", "基础数据"),
+    ;
+    @EnumValue
+    private String key;
+
+    private String remark;
+}

src/main/java/com/glxp/api/constant/ConstantStatus.java

@@ -207,6 +207,7 @@ public class ConstantStatus {
     public static final int FROM_RECEIVE = 13;          //领用单据转单
     public static final int FROM_THRORDER = 14;         //第三方单据转单
     public static final int FROM_Order = 15;          //采购计划转单
+    public static final int FROM_BACK = 17;           //出库转退货单;
 
 
     //DI类型

src/main/java/com/glxp/api/controller/auth/SysUserController.java

@@ -210,6 +210,9 @@ public class SysUserController extends BaseController {
 //        userService.insertUserAuth1(sysUserRole);
         //默认插入第一部门
         List<Long> deptCodeList=authUserSaveRequest.getDepts();
+        if(deptCodeList == null){
+            deptCodeList=new ArrayList<>();
+        }
         deptCodeList.add(1L);
         authUserSaveRequest.setDepts(deptCodeList);
 

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.inout;
 
+import cn.hutool.Hutool;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
@@ -93,6 +94,8 @@ public class IoCodeTempController extends BaseController {
 
     @Resource
     IoOrderDetailBizService orderDetailBizService;
+    @Resource
+    IoCodeService codeService;
 
     //手持端扫码单据上传调用接口
     @AuthRuleAnnotation("")
@@ -464,33 +467,65 @@ public class IoCodeTempController extends BaseController {
         //校验预验收库存是否已存在
         if (bussinessTypeEntity.isScanPreIn()) {
 
+            if (bussinessTypeEntity.getBackPreinType() == 1) {//按单出库
 
+                String orderIds = bussinessTypeEntity.getCheckPreInOrders();
+                if (StrUtil.isNotEmpty(orderIds)) {
+                    String[] orderIdArray = StringUtils.split(",");
+                    List<String> orderList = CollUtil.toList(orderIdArray);
+                    int count = codeService.findByOrderIdsCount(orderList, code);
+                    if (count <= 0) {
+                        return ResultVOUtils.error(500, "预验收库存数量不足！");
+                    }
+                    if (StrUtil.isNotEmpty(orderId)) {//非首次添加
+                        if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品
+                            //无序列号，则可能存在多个预验收入库单
+                            IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code);
+                            if (codeTempEntity != null) {
+                                if (count < (codeTempEntity.getMyCount() + 1)) {
+                                    return ResultVOUtils.error(500, "超出预验收库存数量");
+                                }
+                            }
+                        } else {
+                            if (count < 1) {
+                                return ResultVOUtils.error(500, "预验收库存数量不足");
+                            }
+                        }
+                    }
 
-            int preInCount = invPreinProductDetailService.findCountByCode(code);
+                } else {
-            InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code);
+                    return ResultVOUtils.error(500, "未选择预验收入库单，请先选择预验收入库单！");
-            if (preInCount <= 0) {
-                return ResultVOUtils.error(500, "预验收库存数量不足！");
-            } else {
-                if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(addOrderRequest.getBatchNo())
-                        && !invPreinDetailEntity.getBatchNo().equals(addOrderRequest.getBatchNo())) {
-                    return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
                 }
-                if (StrUtil.isNotEmpty(orderId)) {//非首次添加
+
-                    if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品
+            } else {  //按库存出库
-                        //无序列号，则可能存在多个预验收入库单
+                int preInCount = invPreinProductDetailService.findCountByCode(code);
-                        IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code);
+                InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code);
-                        if (codeTempEntity != null) {
+                if (preInCount <= 0) {
-                            if (preInCount < (codeTempEntity.getMyCount() + 1)) {
+                    return ResultVOUtils.error(500, "预验收库存数量不足！");
-                                return ResultVOUtils.error(500, "超出预验收库存数量");
+                } else {
+                    if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(addOrderRequest.getBatchNo())
+                            && !invPreinDetailEntity.getBatchNo().equals(addOrderRequest.getBatchNo())) {
+                        return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
+                    }
+                    if (StrUtil.isNotEmpty(orderId)) {//非首次添加
+                        if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品
+                            //无序列号，则可能存在多个预验收入库单
+                            IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code);
+                            if (codeTempEntity != null) {
+                                if (preInCount < (codeTempEntity.getMyCount() + 1)) {
+                                    return ResultVOUtils.error(500, "超出预验收库存数量");
+                                }
+                            }
+                        } else {
+                            if (preInCount < 1) {
+                                return ResultVOUtils.error(500, "预验收库存数量不足");
                             }
-                        }
-                    } else {
-                        if (preInCount < 1) {
-                            return ResultVOUtils.error(500, "预验收库存数量不足");
                         }
                     }
                 }
             }
+
+
         }
 
 

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

@@ -1,29 +1,36 @@
 package com.glxp.api.controller.sync;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Dict;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.*;
+import com.glxp.api.controller.purchase.PurOrderController;
 import com.glxp.api.constant.BasicProcessStatus;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.auth.*;
 import com.glxp.api.dao.basic.BasicBusTypeChangeDao;
+import com.glxp.api.dao.basic.BasicBusTypePreDao;
 import com.glxp.api.dao.basic.BasicBussinessTypeDao;
+import com.glxp.api.dao.basic.EntrustReceDao;
 import com.glxp.api.dao.inout.*;
-import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao;
+import com.glxp.api.dao.schedule.SystemParamConfigDao;
-import com.glxp.api.dao.thrsys.ThrDeptDao;
+import com.glxp.api.dao.system.*;
-import com.glxp.api.dao.thrsys.ThrInvWarehouseDao;
+import com.glxp.api.dao.thrsys.*;
 import com.glxp.api.entity.auth.*;
 import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
+import com.glxp.api.entity.basic.BasicBusTypePreEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.basic.EntrustReceEntity;
+import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.inout.*;
-import com.glxp.api.entity.purchase.PurOrderDetailEntity;
+import com.glxp.api.entity.purchase.*;
-import com.glxp.api.entity.purchase.PurOrderEntity;
 import com.glxp.api.entity.sync.BasicDownloadStatusEntity;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
-import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity;
+import com.glxp.api.entity.system.*;
-import com.glxp.api.entity.thrsys.ThrDeptEntity;
+import com.glxp.api.entity.thrsys.*;
-import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.api.req.sync.SpsSyncDataRequest;
 import com.glxp.api.res.sync.*;
 import com.glxp.api.service.inout.IoAddInoutService;
@@ -35,6 +42,8 @@ import com.glxp.api.service.sync.BasicDownloadService;
 import com.glxp.api.service.sync.BasicExportService;
 import com.glxp.api.service.sync.SpsSyncDownloadService;
 import com.glxp.api.util.CustomUtil;
+import com.glxp.api.util.DateUtil;
+import com.glxp.api.util.JsonUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -47,8 +56,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class SpsSyncDownloadController {
@@ -135,6 +149,67 @@ public class SpsSyncDownloadController {
     }
 
 
+    //    下发基础数据 ，供给中继服务，UDI管理系统下载
+    @AuthRuleAnnotation("")
+    @GetMapping("sps/sync/basicData")
+    public BaseResponse getBasicData() {
+        BaseResponse<SpsSyncBasicDataResponse> baseResponse = new BaseResponse<>();
+        SpsSyncBasicDataResponse spsSyncBasicDataResponse = new SpsSyncBasicDataResponse();
+        BasicExportStatusEntity one = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class)
+                .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA.getRemark())
+                .orderByDesc(BasicExportStatusEntity::getStartTime)
+                .last("limit 1")
+        );
+        if (one != null) {
+            if (BasicExportStatusEnum.WAIT_TRIGGERED.getCode().equals(one.getStatus())) {
+                basicExportService.update(Wrappers.lambdaUpdate(BasicExportStatusEntity.class)
+                        .set(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_BUILT.getCode())
+                        .set(BasicExportStatusEntity::getUpdateTime, new Date())
+                        .eq(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_TRIGGERED.getCode())
+                        .eq(BasicExportStatusEntity::getId, one.getId())
+                );
+            } else if (BasicExportStatusEnum.WAIT_SYNC.getCode().equals(one.getStatus())) {
+                // 读取文件数据
+                try {
+                    FileReader reader = new FileReader(one.getCacheFilePath());
+                    StringBuilder str = new StringBuilder();
+                    int data;
+                    while ((data = reader.read()) != -1) {
+                        str.append(data);
+                    }
+                    reader.close();
+                    Dict map = JsonUtils.parseMap(str.toString());
+                    // 组装返回数据
+                    spsSyncBasicDataResponse.setTaskId(one.getId());
+                    spsSyncBasicDataResponse.setHospTypeList((List<BasicHospTypeEntity>) map.get(BasicHospTypeEntity.class.getName()));
+                    spsSyncBasicDataResponse.setUdiRelevanceList((List<UdiRelevanceEntity>) map.get(UdiRelevanceEntity.class.getName()));
+                    spsSyncBasicDataResponse.setProductsList((List<BasicProductsEntity>) map.get(BasicProductsEntity.class.getName()));
+                    spsSyncBasicDataResponse.setRelevanceList((List<CompanyProductRelevanceEntity>) map.get(CompanyProductRelevanceEntity.class.getName()));
+                    spsSyncBasicDataResponse.setCorpList((List<BasicCorpEntity>) map.get(BasicCorpEntity.class.getName()));
+                    spsSyncBasicDataResponse.setSupCertList((List<SupCertEntity>) map.get(SupCertEntity.class.getName()));
+                    spsSyncBasicDataResponse.setSupCertSetList((List<SupCertSetEntity>) map.get(SupCertSetEntity.class.getName()));
+                    spsSyncBasicDataResponse.setSupCompanyList((List<SupCompanyEntity>) map.get(SupCompanyEntity.class.getName()));
+                    spsSyncBasicDataResponse.setSupManufacturerList((List<SupManufacturerEntity>) map.get(SupManufacturerEntity.class.getName()));
+                    spsSyncBasicDataResponse.setSupProductList((List<SupProductEntity>) map.get(SupProductEntity.class.getName()));
+                } catch (FileNotFoundException e) {
+                    throw new RuntimeException("系统异常，未找到对应数据文件");
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                // 修改任务状态
+//                basicExportService.update(Wrappers.lambdaUpdate(BasicExportStatusEntity.class)
+//                        .set(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.COMPLETED.getCode())
+//                        .set(BasicExportStatusEntity::getUpdateTime, new Date())
+//                        .set(BasicExportStatusEntity::getEndTime, new Date())
+//                        .eq(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_SYNC.getCode())
+//                        .eq(BasicExportStatusEntity::getId, one.getId())
+//                );
+            }
+        }
+        baseResponse.setData(spsSyncBasicDataResponse);
+        return baseResponse;
+    }
+
     //接收中继服务、UDI管理系统上传单据
     @AuthRuleAnnotation("sps/sync/order/upload")
     @PostMapping("/sps/sync/order/upload")
@@ -477,7 +552,7 @@ public class SpsSyncDownloadController {
 
 
     //接收中继服务、UDI管理系统上传基础信息
-    @AuthRuleAnnotation("")
+    //@AuthRuleAnnotation("")
     @PostMapping("/sps/sync/thrData/upload")
     public BaseResponse uploadThrData(@RequestBody @Valid SpsSyncThrDataResponse spsSyncThrDataResponse) {
         if (spsSyncThrDataResponse != null) {
@@ -487,9 +562,9 @@ public class SpsSyncDownloadController {
             basicDownloadStatusEntity.setId(CustomUtil.getId());
             basicDownloadStatusEntity.setTaskId(spsSyncThrDataResponse.getTaskId());
             basicDownloadStatusEntity.setStartTime(new Date());
-            basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_BUS_TYPE);
+            basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_DATA);
             basicDownloadStatusEntity.setStatus(0);
-            basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS);
+            basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_DATA);
             basicDownloadStatusEntity.setScheduleType(1);
             basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
 
@@ -512,6 +587,15 @@ public class SpsSyncDownloadController {
             sqlSession.commit();
             remark.append("第三方仓库信息：").append(spsSyncThrDataResponse.getInvWarehouseEntities().size()).append("条\n");
 
+            //第三方往来单位信息
+            if (CollUtil.isNotEmpty(spsSyncThrDataResponse.getCorpEntities())) {
+                List<ThrCorpEntity> corpEntities = spsSyncThrDataResponse.getCorpEntities();
+                ThrCorpDao mapper = sqlSession.getMapper(ThrCorpDao.class);
+                corpEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("第三方往来单位信息：").append(spsSyncThrDataResponse.getCorpEntities().size()).append("条\n");
+
             sqlSession.close();
             basicDownloadStatusEntity.setStatus(1);
             basicDownloadStatusEntity.setUpdateTime(new Date());
@@ -524,17 +608,161 @@ public class SpsSyncDownloadController {
     }
 
     //接收中继服务、UDI管理系统上传系统设置
-    @AuthRuleAnnotation("")
+    //@AuthRuleAnnotation("")
     @PostMapping("/sps/sync/sys/setting")
     public BaseResponse uploadSysSetting(@RequestBody @Valid SpsSyncSysSettingResponse spsSyncSysSettingResponse) {
-        return ResultVOUtils.success();
+        if (spsSyncSysSettingResponse != null) {
+            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
+
+            BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
+            basicDownloadStatusEntity.setId(CustomUtil.getId());
+            basicDownloadStatusEntity.setTaskId(spsSyncSysSettingResponse.getTaskId());
+            basicDownloadStatusEntity.setStartTime(new Date());
+            basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_SYS_SETTING);
+            basicDownloadStatusEntity.setStatus(0);
+            basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_SYS_SETTING);
+            basicDownloadStatusEntity.setScheduleType(1);
+            basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
+
+            StringBuilder remark = new StringBuilder();
+
+            //系统运行参数
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemParamConfigEntities())) {
+                List<SystemParamConfigEntity> systemParamConfigEntities = spsSyncSysSettingResponse.getSystemParamConfigEntities();
+                SystemParamConfigDao mapper = sqlSession.getMapper(SystemParamConfigDao.class);
+                systemParamConfigEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("系统运行参数：").append(spsSyncSysSettingResponse.getSystemParamConfigEntities().size()).append("条\n");
+
+            //委托验收设置
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getEntrustReceEntities())) {
+                List<EntrustReceEntity> entrustReceEntities = spsSyncSysSettingResponse.getEntrustReceEntities();
+                EntrustReceDao mapper = sqlSession.getMapper(EntrustReceDao.class);
+                entrustReceEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("委托验收设置：").append(spsSyncSysSettingResponse.getEntrustReceEntities().size()).append("条\n");
+
+            //打印模块
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemPDFModuleEntities())) {
+                List<SystemPDFModuleEntity> systemPDFModuleEntities = spsSyncSysSettingResponse.getSystemPDFModuleEntities();
+                SystemPDFModuleDao mapper = sqlSession.getMapper(SystemPDFModuleDao.class);
+                systemPDFModuleEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("打印模块：").append(spsSyncSysSettingResponse.getSystemPDFModuleEntities().size()).append("条\n");
+
+            //打印模板
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSystemPDFTemplateEntities())) {
+                List<SystemPDFTemplateEntity> systemPDFTemplateEntities = spsSyncSysSettingResponse.getSystemPDFTemplateEntities();
+                SystemPDFTemplateDao mapper = sqlSession.getMapper(SystemPDFTemplateDao.class);
+                systemPDFTemplateEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("打印模板：").append(spsSyncSysSettingResponse.getSystemPDFTemplateEntities().size()).append("条\n");
+
+            //扫码单据关联表
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities())) {
+                List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities();
+                SysPdfTemplateRelevanceCodeDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceCodeDao.class);
+                sysPdfTemplateRelevanceCodeEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("扫码单据关联表：").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceCodeEntities().size()).append("条\n");
+
+            //业务单据关联表
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities())) {
+                List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities();
+                SysPdfTemplateRelevanceBizDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceBizDao.class);
+                sysPdfTemplateRelevanceBizEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("业务单据关联表：").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceBizEntities().size()).append("条\n");
+
+            //内部码打印关联表
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceLabelEntities())) {
+                List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceLabelEntities();
+                SysPdfTemplateRelevanceLabelDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceLabelDao.class);
+                sysPdfTemplateRelevanceLabelEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("内部码打印关联表：").append(spsSyncSysSettingResponse.getSystemParamConfigEntities().size()).append("条\n");
+
+            //资质证书打印关联表
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities())) {
+                List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntities = spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities();
+                SysPdfTemplateRelevanceStatemenDao mapper = sqlSession.getMapper(SysPdfTemplateRelevanceStatemenDao.class);
+                sysPdfTemplateRelevanceStatemenEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("资质证书打印关联表：").append(spsSyncSysSettingResponse.getSysPdfTemplateRelevanceStatemenEntities().size()).append("条\n");
+
+            //自动建出入库单设置
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getBasicBusTypePreEntities())) {
+                List<BasicBusTypePreEntity> basicBusTypePreEntities = spsSyncSysSettingResponse.getBasicBusTypePreEntities();
+                BasicBusTypePreDao mapper = sqlSession.getMapper(BasicBusTypePreDao.class);
+                basicBusTypePreEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("自动建出入库单设置：").append(spsSyncSysSettingResponse.getBasicBusTypePreEntities().size()).append("条\n");
+
+            //自动建业务单设置
+            if (CollUtil.isNotEmpty(spsSyncSysSettingResponse.getBasicBusTypeChangeEntities())) {
+                List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = spsSyncSysSettingResponse.getBasicBusTypeChangeEntities();
+                BasicBusTypeChangeDao mapper = sqlSession.getMapper(BasicBusTypeChangeDao.class);
+                basicBusTypeChangeEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("自动建业务单设置：").append(spsSyncSysSettingResponse.getBasicBusTypeChangeEntities().size()).append("条\n");
+
+            sqlSession.close();
+            basicDownloadStatusEntity.setStatus(1);
+            basicDownloadStatusEntity.setUpdateTime(new Date());
+            basicDownloadStatusEntity.setEndTime(new Date());
+            basicDownloadStatusEntity.setRemark(remark.toString());
+            basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
+        }
+
+        return ResultVOUtils.success("上传成功");
     }
 
     //接收中继服务、UDI管理系统上传第三方产品信息
-    @AuthRuleAnnotation("")
+    //@AuthRuleAnnotation("")
     @PostMapping("/sps/sync/thrData/products/upload")
     public BaseResponse uploadThrProducts(@RequestBody @Valid SpsSyncThrProductsResponse spsSyncThrProductsResponse) {
-        return ResultVOUtils.success();
+        if (spsSyncThrProductsResponse != null) {
+            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
+
+            BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
+            basicDownloadStatusEntity.setId(CustomUtil.getId());
+            basicDownloadStatusEntity.setTaskId(spsSyncThrProductsResponse.getTaskId());
+            basicDownloadStatusEntity.setStartTime(new Date());
+            basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_THR_PRODUCTS);
+            basicDownloadStatusEntity.setStatus(0);
+            basicDownloadStatusEntity.setType(BasicProcessStatus.NEW_ALL_THR_PRODUCTS);
+            basicDownloadStatusEntity.setScheduleType(1);
+            basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
+
+            StringBuilder remark = new StringBuilder();
+            //第三方产品信息
+            if (CollUtil.isNotEmpty(spsSyncThrProductsResponse.getProductsEntities())) {
+                List<ThrProductsEntity> productsEntities = spsSyncThrProductsResponse.getProductsEntities();
+                ThrProductsDao mapper = sqlSession.getMapper(ThrProductsDao.class);
+                productsEntities.forEach(mapper::insertOrUpdate);
+            }
+            sqlSession.commit();
+            remark.append("第三方产品信息：").append(spsSyncThrProductsResponse.getProductsEntities().size()).append("条\n");
+
+            sqlSession.close();
+            basicDownloadStatusEntity.setStatus(1);
+            basicDownloadStatusEntity.setUpdateTime(new Date());
+            basicDownloadStatusEntity.setEndTime(new Date());
+            basicDownloadStatusEntity.setRemark(remark.toString());
+            basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
+        }
+
+        return ResultVOUtils.success("上传成功");
     }
 
 }

src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java

@@ -21,4 +21,6 @@ public interface BasicBusTypeChangeDao extends BaseMapperPlus<BasicBusTypeChange
      * @return
      */
     List<BasicBusTypeChangeResponse> filterList(FilterBusTypeChangeRequest filterBusTypeChangeRequest);
+
+    boolean insertOrUpdate(BasicBusTypeChangeEntity record);
 }

src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java

@@ -42,4 +42,6 @@ public interface BasicBusTypePreDao extends BaseMapperPlus<BasicBusTypePreDao, B
      */
     List<BasicBusTypePreResponse> selectBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest);
 
+    boolean insertOrUpdate(BasicBusTypePreEntity record);
+
 }

src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java

@@ -1,9 +1,9 @@
 package com.glxp.api.dao.basic;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
-import com.glxp.api.res.thrsys.ThrCorpsResponse;
 import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -11,16 +11,16 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface BasicCorpDao {
+public interface BasicCorpDao extends BaseMapper<BasicCorpEntity> {
     List<BasicCorpEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
 
     boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity);
 
     boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse);
 
-    boolean insert(BasicCorpEntity basicUnitMaintainEntity);
+    int insert(BasicCorpEntity basicUnitMaintainEntity);
 
-    boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest);
+    int updateById(BasicCorpEntity basicUnitMaintainSaveRequest);
 
     BasicCorpEntity selectByThirdId(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
 

src/main/java/com/glxp/api/dao/basic/BasicProductsDao.java

@@ -0,0 +1,16 @@
+package com.glxp.api.dao.basic;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.basic.BasicProductSetEntity;
+import com.glxp.api.entity.basic.BasicProductsEntity;
+import com.glxp.api.req.basic.FilterBasicProductSetrequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BasicProductsDao extends BaseMapper<BasicProductsEntity> {
+
+
+}

src/main/java/com/glxp/api/dao/basic/EntrustReceDao.java

@@ -27,5 +27,6 @@ public interface EntrustReceDao extends BaseMapperPlus<EntrustReceDao, EntrustRe
 
     boolean deleteAll();
 
+    boolean insertOrUpdate(EntrustReceEntity record);
 
 }

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

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.purchase;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.purchase.SupCertSetEntity;
 import com.glxp.api.req.purchase.FilterCertSetsRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 
 @Mapper
-public interface SupCertSetDao {
+public interface SupCertSetDao extends BaseMapper<SupCertSetEntity> {
     List<SupCertSetEntity> filterCertSets(FilterCertSetsRequest filterCertSetsRequest);
 
     boolean insertCertSet(SupCertSetEntity supCertSetEntity);

src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.purchase;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.purchase.SupCompanyEntity;
 import com.glxp.api.req.purchase.FilterSupCompanyRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 
 @Mapper
-public interface SupCompanyDao {
+public interface SupCompanyDao extends BaseMapper<SupCompanyEntity> {
 
     SupCompanyEntity findCompany(String CustomerId);
 

src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.purchase;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.purchase.SupManufacturerEntity;
 import com.glxp.api.req.purchase.FilterSupManufacturerRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface SupManufacturerDao {
+public interface SupManufacturerDao extends BaseMapper<SupManufacturerEntity> {
 
     SupManufacturerEntity findCompany(Long id);
 

src/main/java/com/glxp/api/dao/schedule/SystemParamConfigDao.java

@@ -29,4 +29,6 @@ public interface SystemParamConfigDao {
 
     boolean insert(SystemParamConfigEntity systemParamConfigEntity);
 
+    int insertOrUpdate(SystemParamConfigEntity record);
+
 }

src/main/java/com/glxp/api/dao/sync/BasicExportDao.java

@@ -1,5 +1,6 @@
 package com.glxp.api.dao.sync;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.req.sync.BasicExportStatusRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface BasicExportDao {
+public interface BasicExportDao extends BaseMapper<BasicExportStatusEntity> {
 
 
     List<BasicExportStatusEntity> filterExportStatus(BasicExportStatusRequest basicExportStatusRequest);

src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java

@@ -1,5 +1,6 @@
 package com.glxp.api.dao.sync;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
 import com.glxp.api.req.sync.BasicExportTimeRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -7,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 
 @Mapper
-public interface BasicExportTimeDao {
+public interface BasicExportTimeDao extends BaseMapper<BasicExportStatusTimeEntity> {
 
 
     List<BasicExportStatusTimeEntity> filterExportStatus(BasicExportTimeRequest basicExportStatusRequest);

src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceBizDao.java

@@ -1,19 +1,17 @@
 package com.glxp.api.dao.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.glxp.api.entity.system.SysMenuHelpEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
-
-import java.util.List;
-
-import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity;
 import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
 import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
-import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface SysPdfTemplateRelevanceBizDao extends BaseMapper<SysPdfTemplateRelevanceBizEntity> {
 
     List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
 
     boolean upInsert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity);
+
+    boolean insertOrUpdate(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity);
 }

src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceCodeDao.java

@@ -1,16 +1,13 @@
 package com.glxp.api.dao.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
-
-import java.util.List;
-
-import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity;
 import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
 import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper<SysPdfTemplateRelevanceCodeEntity> {
 
     List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
@@ -19,6 +16,6 @@ public interface SysPdfTemplateRelevanceCodeDao extends BaseMapper<SysPdfTemplat
 
     SysPdfTemplateRelevanceCodeEntity selectNameAndAction(@Param("name") String name, @Param("localAction") String localAction);
 
-
+    boolean insertOrUpdate(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity);
 
 }

src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceLabelDao.java

@@ -1,16 +1,15 @@
 package com.glxp.api.dao.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
-
-import java.util.List;
-
 import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
 import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
-import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface SysPdfTemplateRelevanceLabelDao extends BaseMapper<SysPdfTemplateRelevanceLabelEntity> {
 
     List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
+
+    boolean insertOrUpdate(SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity);
 }

src/main/java/com/glxp/api/dao/system/SysPdfTemplateRelevanceStatemenDao.java

@@ -1,17 +1,16 @@
 package com.glxp.api.dao.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
-
-import java.util.List;
-
 import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
 import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
-import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface SysPdfTemplateRelevanceStatemenDao extends BaseMapper<SysPdfTemplateRelevanceStatemenEntity> {
 
     List<SystemPDFTemplateRelevanceResponse> filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest);
 
+    boolean insertOrUpdate(SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity);
+
 }

src/main/java/com/glxp/api/dao/system/SystemPDFModuleDao.java

@@ -1,6 +1,5 @@
 package com.glxp.api.dao.system;
 
-import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
 import com.glxp.api.entity.system.SystemPDFModuleEntity;
 import com.glxp.api.req.system.FilterPdfModuleRequest;
 import com.glxp.api.req.system.SysPdfModuleSaveRequest;
@@ -27,4 +26,6 @@ public interface SystemPDFModuleDao {
     boolean insert(SystemPDFModuleEntity systemPDFModuleEntity);
 
     boolean deleteById(Integer id);
+
+    boolean insertOrUpdate(SystemPDFModuleEntity systemPDFModuleEntity);
 }

src/main/java/com/glxp/api/dao/system/SystemPDFTemplateDao.java

@@ -23,4 +23,6 @@ public interface SystemPDFTemplateDao {
     boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity);
 
     boolean deleteById(Integer id);
+
+    boolean insertOrUpdate(SystemPDFTemplateEntity systemPDFTemplateEntity);
 }

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

@@ -36,4 +36,5 @@ public interface ThrCorpDao {
     ThrSystemDetailEntity selectByKey(@Param("key") String key, @Param("thirdSys") String thirdSys);
 
 
+    boolean insertOrUpdate(ThrCorpEntity thrCorpEntity);
 }

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

@@ -1,10 +1,8 @@
 package com.glxp.api.dao.thrsys;
 
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.res.thrsys.ThrProductsResponse;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -33,6 +31,6 @@ public interface ThrProductsDao {
     
     List<ThrProductsEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest);
 
-
+    int insertOrUpdate(ThrProductsEntity record);
 
 }

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

@@ -402,6 +402,8 @@ public class BasicBussinessTypeEntity {
     //    预验收剩余库存退库方式  1:按单使用或退库，2：按货位/仓库使用或退库
     @TableField(value = "backPreinType")
     private Integer backPreinType;
+    @TableField(value = "checkPreInOrders")
+    private String checkPreInOrders;
 
     //    寄售使用禁止无库存出库
     @TableField(value = "advancePreIn")

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

@@ -1,10 +1,15 @@
 package com.glxp.api.entity.basic;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
+@TableName(value = "basic_product_set")
 public class BasicProductSetEntity {
 
+    @TableId(type = IdType.AUTO)
     private Integer id;
     private String parmName;
     private String parmKey;
@@ -17,6 +22,4 @@ public class BasicProductSetEntity {
     private Integer sort;
 
 
-
-
 }

src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java

@@ -2,20 +2,42 @@ package com.glxp.api.entity.sync;
 
 import java.util.Date;
 
+import cn.hutool.core.date.DateUtil;
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.ibatis.type.JdbcType;
 
 
 @Data
+@TableName("basic_export_status")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class BasicExportStatusEntity {
+    @TableId(type = IdType.INPUT)
     private String id;
+    @TableField(value = "idDatas")
     private String idDatas;
     private Integer status;
     private String type;
+    @TableField(value = "updateTime")
     private Date updateTime;
+    @TableField(value = "scheduleType")
     private Integer scheduleType;
+    @TableField(value = "startTime")
     private Date startTime;
+    @TableField(value = "endTime")
     private Date endTime;
     private String remark;
+    @TableField(value = "receiveStatus")
     private String receiveStatus;
+    @TableField(value = "cacheFilePath")
     private String cacheFilePath;
 }

src/main/java/com/glxp/api/entity/sync/BasicExportStatusTimeEntity.java

@@ -1,12 +1,27 @@
 package com.glxp.api.entity.sync;
 
+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 lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @Data
+@TableName("basic_export_status_time")
 public class BasicExportStatusTimeEntity {
 
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+    @TableField(value = "lastUpdateTime")
     private String lastUpdateTime;
+
+    @TableField(value = "`key`")
     private String key;
     private String remark;
 

src/main/java/com/glxp/api/idc/controller/FileController.java

@@ -30,10 +30,21 @@ public class FileController {
 
     @RequestMapping(value = "/spssync/file/upload")
     @ResponseBody
-    public BaseResponse connect(HttpServletRequest request, @RequestBody Map<String, Object> params) {
+    public BaseResponse upload(HttpServletRequest request, @RequestBody Map<String, Object> params) {
         return fileService.fileUpload(request,params);
     }
    
+    @RequestMapping(value = "/spssync/file/download")
+    @ResponseBody
+    public BaseResponse download(HttpServletRequest request, @RequestBody Map<String, Object> params) {
+        return fileService.fileDownload(request,params);
+    }
+    
+    @RequestMapping(value = "/spssync/file/downloadFile")
+    @ResponseBody
+    public BaseResponse downloadFile(HttpServletRequest request, @RequestBody Map<String, Object> params) {
+        return fileService.downloadFile(request,params);
+    }
     
     @RequestMapping(value = "/spssync/file/uploadFile")
     public BaseResponse uploadFile(HttpServletRequest request,

src/main/java/com/glxp/api/idc/service/FileService.java

@@ -12,5 +12,7 @@ import com.glxp.api.common.res.BaseResponse;
 /*文件服务*/
 public interface FileService {
     BaseResponse fileUpload(HttpServletRequest request,Map<String,Object> params);
+    BaseResponse fileDownload(HttpServletRequest request,Map<String,Object> params);
+    BaseResponse downloadFile(HttpServletRequest request,Map<String,Object> params);
     BaseResponse receiveFile(HttpServletRequest request,String content,MultipartFile[] files);
 }

src/main/java/com/glxp/api/idc/service/IdcService.java

@@ -38,4 +38,5 @@ public interface IdcService {
     void downloadFile(String fileName,HttpServletResponse response) ;
     
     BaseResponse onceSync(String tableName,boolean isUpload);
+    boolean signleDownloadFile(String syncIp, String fileName);
 }

src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java

@@ -19,10 +19,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.dao.idc.DbDao;
 import com.glxp.api.idc.service.FileService;
+import com.glxp.api.idc.service.IdcService;
 import com.glxp.api.idc.utils.IDCUtils;
 import com.glxp.api.util.FileUtils;
 
@@ -47,6 +49,8 @@ public class FileServiceImpl implements FileService {
     
     @Resource
     private DbDao dbDao;
+    @Resource
+    private IdcService idcService;
     private String imagePath = "register/file/image2/";
     @Override
     public BaseResponse fileUpload(HttpServletRequest request,Map<String,Object> params) {
@@ -83,9 +87,10 @@ public class FileServiceImpl implements FileService {
                 }
             }
             if(!isExists)
-                return ResultVOUtils.error(9999,"文件不存在");
+                return ResultVOUtils.error(9999,filePath + filePathSlash + imagePath + strs[0]);
             String result = relayFile(files,host);
-            if (IDCUtils.isJson(result)&&!result.contains("<html")) {
+            logger.error(result);
+            if (IDCUtils.isJson(result)) {
                 BaseResponse baseResponse = JSON.parseObject(result,BaseResponse.class);
                 return baseResponse;
             }
@@ -93,6 +98,35 @@ public class FileServiceImpl implements FileService {
         return ResultVOUtils.error(9999,"失败");
     }
     
+    
+    
+    @Override
+    public BaseResponse fileDownload(HttpServletRequest request,Map<String,Object> params) {
+        Map<String, Object> map = dbDao.get("select * from sync_data_set limit 1");
+        if(map!=null&&map.get("syncIp")!=null) {
+       
+            String result = IDCUtils.post(map.get("syncIp").toString()+"/spssync/file/downloadFile", params);
+            boolean success = false;
+            if(IDCUtils.isJson(result)) {
+                JSONObject object = JSON.parseObject(result);
+                
+                if(object.getInteger("code")==20000) {
+                    String[] files = params.get("fileName").toString().split(",");
+                    success = true;
+                    for(String str:files) {
+                        if(!idcService.signleDownloadFile(map.get("syncIp").toString(), str))
+                            success = false;
+                    }
+                }
+            }
+            if(!success)
+                return ResultVOUtils.error(9999,"失败");
+        } else {
+            return ResultVOUtils.error(9999,"中继服务地址未配置，请至同步设置中进行配置");
+        }
+        return ResultVOUtils.success(null);
+    }
+    
     @Override
     public BaseResponse receiveFile(HttpServletRequest request,String content,MultipartFile[] files) {
         boolean isRelay = false;
@@ -111,7 +145,6 @@ public class FileServiceImpl implements FileService {
         ArrayList<String> saveFiles = new ArrayList<>();
         Date startTime = new Date();
         if (files != null) {
-            logger.debug(filePath + filePathSlash + imagePath);
             if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath))
                 IDCUtils.createDirectory(filePath + filePathSlash + imagePath);
             try {
@@ -132,10 +165,11 @@ public class FileServiceImpl implements FileService {
 
         if(isRelay) {
             String result = relayFile(saveFiles,host);
+            logger.info(result);
             if (IDCUtils.isJson(result)&&!result.contains("<html")) {
                 BaseResponse baseResponse = JSON.parseObject(result,BaseResponse.class);
                 return baseResponse;
-            }else {
+            } else {
                 return ResultVOUtils.error(9999,"上传失败");
             }
         }
@@ -197,4 +231,34 @@ public class FileServiceImpl implements FileService {
         return result;
     }
     
+    
+    @Override
+    public BaseResponse downloadFile(HttpServletRequest request,Map<String,Object> params) {
+        String host = ""; 
+        try {
+            Map<String,Object> config =dbDao.get("select paramValue from system_param_config where paramKey='upper_server_ip'");
+            if(config!=null&&config.get("paramValue")!=null)
+                host = config.get("paramValue").toString();
+        } catch (Exception ex) {
+            
+        }
+        if(!StringUtils.isEmpty(host)) {
+            String result = IDCUtils.post(host+"/spssync/file/downloadFile", params); 
+            JSONObject object = JSON.parseObject(result);
+            boolean success = false;
+            if(object.getInteger("code")==20000) {
+                String[] files = params.get("fileName").toString().split(",");
+                success = true;
+                for(String str:files) {
+                    if(!idcService.signleDownloadFile(host, str))
+                        success = false;
+                }
+            }
+            if(!success)
+                ResultVOUtils.error(9999,"失败");   
+        
+        }
+        return ResultVOUtils.success(null); 
+    }
+    
 }

src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java

@@ -1162,7 +1162,8 @@ public class IdcServiceImpl implements IdcService {
         return success;
     }
 
-    private boolean signleDownloadFile(String syncIp, String fileName) {
+    @Override
+    public boolean signleDownloadFile(String syncIp, String fileName) {
         String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
         if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath))
             IDCUtils.createDirectory(filePath + filePathSlash + imagePath);
@@ -1178,10 +1179,11 @@ public class IdcServiceImpl implements IdcService {
                 .post(body)
                 .addHeader("Content-Type", "application/x-www-form-urlencoded")
                 .build();
+        int total=0; 
         try {
             Response result = client.newCall(request).execute();
             String msg = result!=null ? result.message().length()>200 ? result.message().substring(0,200) : result.message() : "";
-            int total = 0;
+            
             if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) {
                 try (InputStream inputStream = result.body().byteStream()) {
                    
@@ -1220,7 +1222,7 @@ public class IdcServiceImpl implements IdcService {
             e.printStackTrace();
         }
 
-        return true;
+        return (total>0);
     }
 
     /*获取转发服务地址，当前值允许单向，只使用参数upper_server_ip*/

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -300,6 +300,7 @@ public class BussinessTypeSaveRequest {
     private boolean checkCertExpire;
     private String preInBackAction;
     private Integer backPreinType;
+    private String checkPreInOrders;
 
     private Boolean advancePreIn;
 }

src/main/java/com/glxp/api/req/system/SysParamConfigSaveRequest.java

@@ -2,6 +2,8 @@ package com.glxp.api.req.system;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class SysParamConfigSaveRequest {
 
@@ -13,4 +15,5 @@ public class SysParamConfigSaveRequest {
     private int paramStatus;
     private int paramType;
     private String paramExplain;
+    private Date updateTime;
 }

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

@@ -149,5 +149,6 @@ public class BasicBussinessTypeResponse {
     private boolean checkCertExpire;
     private String preInBackAction;
     private Integer backPreinType;
+    private String checkPreInOrders;
     private Boolean advancePreIn;
 }

src/main/java/com/glxp/api/res/inv/InvPreProductResponse.java

@@ -105,4 +105,8 @@ public class InvPreProductResponse {
      */
     private String invCode;
 
+    /**
+        计量单位
+     */
+    private String measname;
 }

src/main/java/com/glxp/api/res/sync/SpsSyncBasicDataResponse.java

@@ -0,0 +1,23 @@
+package com.glxp.api.res.sync;
+
+import com.glxp.api.entity.basic.*;
+import com.glxp.api.entity.purchase.*;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncBasicDataResponse extends BaseSyncResponse {
+
+
+    List<BasicHospTypeEntity> hospTypeList;
+    List<UdiRelevanceEntity> udiRelevanceList;
+    List<BasicProductsEntity> productsList;
+    List<CompanyProductRelevanceEntity> relevanceList;
+    List<BasicCorpEntity> corpList;
+    List<SupCertEntity> supCertList;
+    List<SupCertSetEntity> supCertSetList;
+    List<SupCompanyEntity> supCompanyList;
+    List<SupManufacturerEntity> supManufacturerList;
+    List<SupProductEntity> supProductList;
+}

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

@@ -1,6 +1,7 @@
 package com.glxp.api.service.basic;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
 import com.glxp.api.res.thrsys.ThrCorpsResponse;
@@ -8,7 +9,7 @@ import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
 
 import java.util.List;
 
-public interface BasicCorpService {
+public interface BasicCorpService extends IService<BasicCorpEntity> {
 
     List<BasicCorpEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
 

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

@@ -1,5 +1,6 @@
 package com.glxp.api.service.basic;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.basic.BasicHospTypeEntity;
 import com.glxp.api.req.basic.BasicHospTypeFilterRequest;
 import com.glxp.api.req.basic.BasicHospTypeRequest;
@@ -10,7 +11,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse;
 
 import java.util.List;
 
-public interface BasicHospTypeService {
+public interface BasicHospTypeService extends IService<BasicHospTypeEntity> {
 
     List<BasicHospTypeEntity> filterHospTypeList(BasicHospTypeFilterRequest basicHospTypeFilterRequest);
 

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

@@ -1,13 +1,14 @@
 package com.glxp.api.service.basic;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
 import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
 import com.glxp.api.res.basic.CompanyProductRelevanceResponse;
 
 import java.util.List;
 
-public interface CompanyProductRelevanceService {
+public interface CompanyProductRelevanceService extends IService<CompanyProductRelevanceEntity> {
 
     List<CompanyProductRelevanceResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest);
 

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

@@ -1,6 +1,7 @@
 package com.glxp.api.service.basic;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
@@ -10,7 +11,7 @@ import java.util.List;
 /**
  * 耗材字典关联
  */
-public interface UdiRelevanceService {
+public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
 
     List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
 

src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java

@@ -1,6 +1,8 @@
 package com.glxp.api.service.basic.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.BooleanUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.BasicCorpDao;
 import com.glxp.api.entity.basic.BasicCorpEntity;
@@ -18,7 +20,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class BasicCorpServiceImpl implements BasicCorpService {
+public class BasicCorpServiceImpl extends ServiceImpl<BasicCorpDao, BasicCorpEntity> implements BasicCorpService {
 
     @Resource
     BasicCorpDao basicCorpDao;
@@ -50,13 +52,13 @@ public class BasicCorpServiceImpl implements BasicCorpService {
 
     @Override
     public boolean insert(BasicCorpEntity basicUnitMaintainEntity) {
-        return basicCorpDao.insert(basicUnitMaintainEntity);
+        return basicCorpDao.insert(basicUnitMaintainEntity) == 0 ? false : true;
     }
 
     @Override
     public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) {
         basicUnitMaintainSaveRequest.setUpdateTime(new Date());
-        return basicCorpDao.updateById(basicUnitMaintainSaveRequest);
+        return basicCorpDao.updateById(basicUnitMaintainSaveRequest) == 0 ? false : true;
     }
 
     @Override

src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl;
 
 import cn.hutool.core.util.StrUtil;
 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.basic.BasicHospTypeDao;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
@@ -26,7 +27,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class BasicHospTypeServiceImpl implements BasicHospTypeService {
+public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao, BasicHospTypeEntity> implements BasicHospTypeService {
 
     @Resource
     BasicHospTypeDao basicHospTypeDao;

src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl;
 
 
 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.basic.CompanyProductRelevanceDao;
 import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
@@ -17,7 +18,8 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class CompanyProductRelevanceServiceImpl implements CompanyProductRelevanceService {
+public class CompanyProductRelevanceServiceImpl extends ServiceImpl<CompanyProductRelevanceDao, CompanyProductRelevanceEntity>
+        implements CompanyProductRelevanceService {
     @Resource
     CompanyProductRelevanceDao companyProductRelevanceDao;
 

src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
@@ -22,7 +23,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class UdiRelevanceServiceImpl implements UdiRelevanceService {
+public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRelevanceEntity> implements UdiRelevanceService {
     @Resource
     UdiRelevanceDao udiRelevanceDao;
     @Resource

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -27,6 +27,7 @@ import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import net.sf.jasperreports.engine.JRException;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -742,181 +743,74 @@ public class IoCheckInoutService {
     public void genInv(IoOrderEntity orderEntity, BasicBussinessTypeEntity bussinessTypeEntity) {
 
         if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT) && bussinessTypeEntity.isScanPreIn()) {
-
             ThreadUtil.execAsync(() -> {
-                List<IoCodeEntity> backCodeList = new ArrayList<>();
+                if (StrUtil.isNotEmpty(bussinessTypeEntity.getPreInBackAction())) {
-                List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
+                    if (bussinessTypeEntity.getBackPreinType() == 1) {    //按单退货
-                for (IoCodeEntity codeEntity : codeList) {
+
-                    int count = invPreinProductDetailService.findCountByCode(codeEntity.getCode());
+                        String orderIds = bussinessTypeEntity.getCheckPreInOrders();
-                    if (count > 0) {
+                        if (StrUtil.isNotEmpty(orderIds)) {
-                        codeEntity.setCount(count);
+                            String[] orderIdArray = StringUtils.split(",");
-                        codeEntity.setReCount(udiCalCountUtil.getActCount(codeEntity.getNameCode()));
+                            List<String> orderList = CollUtil.toList(orderIdArray);
-                        backCodeList.add(codeEntity);
+                            List<IoCodeEntity> outCodeEntitys = codeService.findByOrderId(orderEntity.getBillNo());
-                    }
+                            List<IoCodeEntity> preInCodeEntities = codeService.findByOrderIds(orderList, null);
-                }
+
-                BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
+                            //                            扣减数量
-                if (StrUtil.isNotEmpty(basicBussinessTypeEntity.getPreInBackAction())) {
+                            for (IoCodeEntity preInCodeEntity : preInCodeEntities) {
-                    IoOrderEntity outOrder = new IoOrderEntity();
+                                for (IoCodeEntity codeEntity : outCodeEntitys) {
-//                    BeanUtils.copyProperties(orderEntity, outOrder);
+                                    if (preInCodeEntity.getCode().equals(codeEntity.getCode())) {
-                    outOrder.setId(null);
+                                        int count = preInCodeEntity.getMyCount() - codeEntity.getMyCount();
-                    outOrder.setMainAction(ConstantType.TYPE_OUT);
+                                        int reCount = preInCodeEntity.getMyReCount() - codeEntity.getMyReCount();
-                    outOrder.setAction(basicBussinessTypeEntity.getAction());
+
-                    outOrder.setCreateTime(new Date());
+                                        if (count > 0) {
-                    outOrder.setFromType(ConstantStatus.FROM_CHANGE);
+                                            preInCodeEntity.setCount(count);
-                    String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(basicBussinessTypeEntity.getPrefix()), "yyyyMMdd"));
+                                            preInCodeEntity.setReCount(reCount);
-                    outOrder.setBillNo(orderNo);
+                                            codeEntity.setCount(0);
-                    outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
+                                            codeEntity.setReCount(0);
-                    outOrder.setCorpOrderId(CustomUtil.getId() + "x");
+                                        } else if (count < 0) {
-                    outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+                                            preInCodeEntity.setCount(0);
-                    orderEntity.setUllageSupNo(outOrder.getBillNo());
+                                            preInCodeEntity.setReCount(0);
-                    orderEntity.setUpdateTime(new Date());
+                                            codeEntity.setCount(-count);
-                    orderService.update(orderEntity);
+                                            codeEntity.setReCount(-reCount);
-                    outOrder.setOriginUllageSupNo(orderEntity.getBillNo());
+                                        } else {
-                    outOrder.setCreateUser(null);
+                                            preInCodeEntity.setCount(0);
-                    outOrder.setReviewUser(null);
+                                            preInCodeEntity.setReCount(0);
-                    orderService.insertOrder(outOrder);
+                                            codeEntity.setCount(0);
-
+                                            codeEntity.setReCount(0);
-                    //生成条码
+                                        }
-                    List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
+                                    }
-                    for (IoCodeEntity warehouseEntity : backCodeList) {
+                                }
-                        IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
+
-                        BeanUtils.copyProperties(warehouseEntity, codeTempEntity);
+                            }
-                        codeTempEntity.setId(null);
+
-                        codeTempEntity.setOrderId(outOrder.getBillNo());
+                            List<IoCodeEntity> backCodeList = new ArrayList<>();
-                        codeTempEntity.setAction(outOrder.getAction());
+                            for (IoCodeEntity codeEntity : preInCodeEntities) {
-                        codeTempEntity.setMainAction(outOrder.getMainAction());
+                                if (codeEntity.getMyCount() > 0) {
-                        codeTempEntity.setCreateTime(new Date());
+                                    backCodeList.add(codeEntity);
-                        codeTempEntity.setUpdateTime(new Date());
+                                }
-                        codeTempEntities.add(codeTempEntity);
+                            }
+                            genBackOrder(orderEntity, backCodeList);
+
+
+                        }
+
+
+                    } else {  //按仓库货位退货
+                        List<IoCodeEntity> backCodeList = new ArrayList<>();
+                        List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
+                        for (IoCodeEntity codeEntity : codeList) {
+                            int count = invPreinProductDetailService.findCountByCode(codeEntity.getCode());
+                            if (count > 0) {
+                                codeEntity.setCount(count);
+                                codeEntity.setReCount(udiCalCountUtil.getActCount(codeEntity.getNameCode()));
+                                backCodeList.add(codeEntity);
+                                genBackOrder(orderEntity, backCodeList);
+                            }
+                        }
                     }
-                    codeTempService.insertBatch(codeTempEntities);
-                    addInoutService.dealProcess(outOrder);
-                    if (!checkManual(outOrder.getBillNo())) {
-                        check(outOrder.getBillNo());
-                    }
-
-
                 }
-
-
-//                //找出UDI码对应的预验收入库单号
-//                Map<String, String> preInOrder = new HashMap<>();
-//                for (IoCodeEntity warehouseEntity : codeList) {
-//                    List<InvPreinDetailEntity> invProductDetailEntities = invPreinDetailService.findByCode(warehouseEntity.getCode());
-//                    if (invProductDetailEntities.size() > 0) {
-//                        for (InvPreinDetailEntity invPreinDetailEntity : invProductDetailEntities)
-//                            preInOrder.put(invPreinDetailEntity.getOrderId(), invPreinDetailEntity.getOrderId());
-//                    }
-//                }
-//                if (preInOrder.size() > 0) {
-//                    String preInBillNo = "";
-//                    boolean isBreak = false;
-//
-//                    for (String key : preInOrder.keySet()) {
-//                        if (!isBreak) {
-//                            preInBillNo = preInBillNo + "," + key;
-//                            IoOrderEntity preInEntity = orderService.findByBillNo(key);
-//                            preInEntity.setPreOutBillNo(orderEntity.getBillNo());
-//                            orderService.update(preInEntity);
-//                            BasicBussinessTypeEntity preBusType = basicBussinessTypeService.findByAction(preInEntity.getAction());
-//                            //预验收不删除单号，方便后续查询
-//                            if (preBusType.isPreInBack()) {            //预验收如果带回，则清空相关预验收库存；
-//                                invPreinDetailService.deleteByOrderId(preInEntity.getBillNo());
-//                                //剩余UDI码生成退货单 todo
-//                                List<IoCodeEntity> codeEntities = codeService.findByOrderId(key);
-//                                backCodeList.addAll(codeEntities);
-//                            } else {            //预验收如果不带回，则清除已出库相关库存
-//                                for (IoCodeEntity codeEntity : codeList) {
-//                                    if (StrUtil.isEmpty(codeEntity.getSerialNo())) {
-//                                        InvPreinDetailEntity invPreinDetailEntity = invPreinDetailService.findByCode(key, codeEntity.getCode());
-//                                        if (invPreinDetailEntity != null) {
-//                                            int count = 0;
-//                                            if (invPreinDetailEntity.getCount() < codeEntity.getCount()) {
-//                                                count = 0;
-//                                            } else {
-//                                                count = invPreinDetailEntity.getCount() - codeEntity.getCount();
-//                                            }
-//                                            if (count >= 0) {
-//                                                isBreak = true;
-//                                                if (count == 0) {
-//                                                    invPreinDetailService.deleteByCode(key, codeEntity.getCode());
-//                                                } else {
-//                                                    invPreinDetailEntity.setCount(count);
-//                                                    invPreinDetailService.update(invPreinDetailEntity);
-//                                                }
-//                                                int reCount = invPreinDetailEntity.getReCount() - codeEntity.getMyReCount();
-//                                                if (reCount == 0) {
-//                                                    invPreinDetailService.deleteByCode(key, codeEntity.getCode());
-//                                                } else {
-//                                                    invPreinDetailEntity.setReCount(reCount);
-//                                                    invPreinDetailService.update(invPreinDetailEntity);
-//                                                }
-//                                            }
-//                                        }
-//                                    } else {
-//                                        invPreinDetailService.deleteByCode(key, codeEntity.getCode());
-//                                    }
-//                                }
-//
-//                            }
-//                        }
-//
-//
-//                    }
-//                orderEntity.setPreInBillNo(preInBillNo.substring(1));
-//                orderService.update(orderEntity);
-//
-//
-//                //生成退货单 1.查出所有关联的单据条码，2.扣减当前出库数量；3.生成单据类型对应绑定的出库单
-//                if (CollUtil.isNotEmpty(backCodeList)) {
-//                    List<IoCodeEntity> realBackCodeList = new ArrayList<>();
-//                    for (IoCodeEntity backCodeEntity : backCodeList) {
-//                        for (IoCodeEntity codeEntity : codeList) {
-//                            if (codeEntity.getCount() != 0 && backCodeEntity.getCode().equals(codeEntity.getCode())) {
-//                                int count = backCodeEntity.getCount() - codeEntity.getCount();
-//                                int reCount = backCodeEntity.getReCount() - codeEntity.getReCount();
-//                                if (count > 0) {
-//                                    codeEntity.setCount(0);
-//                                    codeEntity.setReCount(0);
-//                                    backCodeEntity.setCount(count);
-//                                    backCodeEntity.setReCount(reCount);
-//                                    realBackCodeList.add(backCodeEntity);
-//                                } else if (count == 0) {
-//                                    codeEntity.setCount(0);
-//                                    codeEntity.setReCount(0);
-//                                } else if (count < 0) {
-//                                    codeEntity.setCount(-count);
-//                                    codeEntity.setReCount(-reCount);
-//                                }
-//                            }
-//                        }
-//
-//                    }
-//                    if (CollUtil.isNotEmpty(realBackCodeList)) {
-//                        Map<String, List<IoCodeEntity>> backPreInOrder = new HashMap<>();
-//                        for (IoCodeEntity codeEntity : codeList) {
-//                            List<IoCodeEntity> codeEntities = backPreInOrder.get(codeEntity.getOrderId());
-//                            if (CollUtil.isEmpty(codeEntities)) {
-//                                codeEntities = new ArrayList<>();
-//                            }
-//                            codeEntities.add(codeEntity);
-//                            backPreInOrder.put(codeEntity.getOrderId(), codeEntities);
-//                        }
-//
-//                        for (String key : backPreInOrder.keySet()) {
-//                            IoOrderEntity originOrder = orderService.findByBillNo(key);
-//                            BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(originOrder.getAction());
-//
-//                        }
-//                    }
-//                }
-//            }
-
-
             });
         }
 
-
         //校验是否是不入库存单据
         if (bussinessTypeEntity.isInStock()) {
             //生成库存
@@ -931,10 +825,58 @@ public class IoCheckInoutService {
             //不入库存，直接进行单据流转
             changeInoutService.changeOrder(orderEntity);
         }
+    }
+
+
+    public void genBackOrder(IoOrderEntity orderEntity, List<IoCodeEntity> backCodeList) {
+        if (CollUtil.isEmpty(backCodeList))
+            return;
+        BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
+        if (StrUtil.isNotEmpty(basicBussinessTypeEntity.getPreInBackAction())) {
+            IoOrderEntity outOrder = new IoOrderEntity();
+            outOrder.setId(null);
+            outOrder.setMainAction(ConstantType.TYPE_OUT);
+            outOrder.setAction(basicBussinessTypeEntity.getAction());
+            outOrder.setCreateTime(new Date());
+            outOrder.setFromType(ConstantStatus.FROM_BACK);
+            String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(basicBussinessTypeEntity.getPrefix()), "yyyyMMdd"));
+            outOrder.setBillNo(orderNo);
+            outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
+            outOrder.setCorpOrderId(CustomUtil.getId() + "x");
+            outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+            orderEntity.setUllageSupNo(outOrder.getBillNo());
+            orderEntity.setUpdateTime(new Date());
+            orderService.update(orderEntity);
+            outOrder.setOriginUllageSupNo(orderEntity.getBillNo());
+            outOrder.setCreateUser(null);
+            outOrder.setReviewUser(null);
+            orderService.insertOrder(outOrder);
+
+            //生成条码
+            List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
+            for (IoCodeEntity warehouseEntity : backCodeList) {
+                IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
+                BeanUtils.copyProperties(warehouseEntity, codeTempEntity);
+                codeTempEntity.setId(null);
+                codeTempEntity.setOrderId(outOrder.getBillNo());
+                codeTempEntity.setAction(outOrder.getAction());
+                codeTempEntity.setMainAction(outOrder.getMainAction());
+                codeTempEntity.setCreateTime(new Date());
+                codeTempEntity.setUpdateTime(new Date());
+                codeTempEntities.add(codeTempEntity);
+            }
+            codeTempService.insertBatch(codeTempEntities);
+            addInoutService.dealProcess(outOrder);
+            if (!checkManual(outOrder.getBillNo())) {
+                check(outOrder.getBillNo());
+            }
+
+        }
 
 
     }
 
+
     //   预验收使用出库处理1.不带回扣库存;2.带回时生成退货出库单
     @Resource
     GennerOrderUtils gennerOrderUtils;

src/main/java/com/glxp/api/service/inout/IoCodeService.java

@@ -21,6 +21,10 @@ public interface IoCodeService {
 
     public IoCodeEntity findByUnique(String orderId, String code);
 
+    List<IoCodeEntity> findByOrderIds(List<String> orderIds, String code);
+
+    int findByOrderIdsCount(List<String> orderIds, String code);
+
 
     boolean isExitByRelId(String relId);
 

src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inout.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -66,6 +67,30 @@ public class IoCodeServiceImpl implements IoCodeService {
         return ioCodeDao.selectOne(new QueryWrapper<IoCodeEntity>().eq("orderId", orderId).eq("code", code));
     }
 
+    @Override
+    public List<IoCodeEntity> findByOrderIds(List<String> orderIds, String code) {
+
+        if (StrUtil.isNotEmpty(code))
+            return ioCodeDao.selectList(new QueryWrapper<IoCodeEntity>().eq("code", code).in("orderId", orderIds));
+        else {
+            return ioCodeDao.selectList(new QueryWrapper<IoCodeEntity>().in("orderId", orderIds));
+        }
+    }
+
+    @Override
+    public int findByOrderIdsCount(List<String> orderIds, String code) {
+        List<IoCodeEntity> codeEntities = findByOrderIds(orderIds, code);
+        if (CollUtil.isNotEmpty(codeEntities)) {
+            int count = 0;
+            for (IoCodeEntity codeEntity : codeEntities) {
+                count = count + codeEntity.getMyCount();
+            }
+
+            return count;
+        }
+        return 0;
+    }
+
     @Override
     public boolean isExitByRelId(String relId) {
 //        return ioCodeDao.selectList(new QueryWrapper<IoCodeEntity>().eq("relId", relId).last("limit 1"));

src/main/java/com/glxp/api/service/purchase/SupCertService.java

@@ -3,13 +3,14 @@ package com.glxp.api.service.purchase;
 
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.purchase.SupCertEntity;
 import com.glxp.api.req.purchase.FilterSupCertRequest;
 import com.glxp.api.req.purchase.purPlanPrintRequest;
 
 import java.util.List;
 
-public interface SupCertService {
+public interface SupCertService extends IService<SupCertEntity> {
 
     List<SupCertEntity> filterCompanyCert(FilterSupCertRequest filterSupCertRequest);
 

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

@@ -1,14 +1,13 @@
 package com.glxp.api.service.purchase;
 
 
-
+import com.baomidou.mybatisplus.extension.service.IService;
-
 import com.glxp.api.entity.purchase.SupCertSetEntity;
 import com.glxp.api.req.purchase.FilterCertSetsRequest;
 
 import java.util.List;
 
-public interface SupCertSetService {
+public interface SupCertSetService extends IService<SupCertSetEntity> {
 
 
     List<SupCertSetEntity> filterCertSets(FilterCertSetsRequest filterCertSetsRequest);

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

@@ -2,12 +2,13 @@ package com.glxp.api.service.purchase;
 
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.purchase.SupCompanyEntity;
 import com.glxp.api.req.purchase.FilterSupCompanyRequest;
 
 import java.util.List;
 
-public interface SupCompanyService {
+public interface SupCompanyService extends IService<SupCompanyEntity> {
 
     SupCompanyEntity findCompanyByUnitFk(String unitFk);
 

src/main/java/com/glxp/api/service/purchase/SupManufacturerService.java

@@ -1,14 +1,13 @@
 package com.glxp.api.service.purchase;
 
 
-
+import com.baomidou.mybatisplus.extension.service.IService;
-
 import com.glxp.api.entity.purchase.SupManufacturerEntity;
 import com.glxp.api.req.purchase.FilterSupManufacturerRequest;
 
 import java.util.List;
 
-public interface SupManufacturerService {
+public interface SupManufacturerService extends IService<SupManufacturerEntity> {
 
     SupManufacturerEntity findCompany(Long id);
 

src/main/java/com/glxp/api/service/purchase/SupProductService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.purchase;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.purchase.SupProductEntity;
 import com.glxp.api.req.purchase.FilterPoductRequest;
 import com.glxp.api.res.purchase.SupProductResponse;
@@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface SupProductService {
+public interface SupProductService extends IService<SupProductEntity> {
 
     SupProductEntity findRegistration(Long id);
 

src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.purchase.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.purchase.SupCertDao;
@@ -17,7 +18,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class SupCertServiceImpl implements SupCertService {
+public class SupCertServiceImpl extends ServiceImpl<SupCertDao, SupCertEntity> implements SupCertService {
 
     @Resource
     SupCertDao supCertDao;
@@ -33,6 +34,7 @@ public class SupCertServiceImpl implements SupCertService {
         }
         return supCertDao.filterCompanyCert(filterSupCertRequest);
     }
+
     @Override
     public List<SupCertEntity> selectCompanyCert(FilterSupCertRequest filterSupCertRequest) {
         if (filterSupCertRequest == null) {
@@ -110,8 +112,8 @@ public class SupCertServiceImpl implements SupCertService {
     }
 
     @Override
-    public boolean updateCustomerId(String oldId, String newId,Integer auditStatus) {
+    public boolean updateCustomerId(String oldId, String newId, Integer auditStatus) {
-        return supCertDao.updateCustomerId(oldId, newId,auditStatus);
+        return supCertDao.updateCustomerId(oldId, newId, auditStatus);
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.glxp.api.service.purchase.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.purchase.SupCertSetDao;
 import com.glxp.api.entity.purchase.SupCertSetEntity;
@@ -14,7 +15,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class SupCertSetServiceImpl implements SupCertSetService {
+public class SupCertSetServiceImpl extends ServiceImpl<SupCertSetDao, SupCertSetEntity> implements SupCertSetService {
 
     @Resource
     SupCertSetDao supCertSetDao;

src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.purchase.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.purchase.SupCompanyDao;
 import com.glxp.api.entity.purchase.SupCompanyEntity;
@@ -14,7 +15,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class SupCompanyServiceImpl implements SupCompanyService {
+public class SupCompanyServiceImpl extends ServiceImpl<SupCompanyDao,SupCompanyEntity> implements SupCompanyService {
 
     @Resource
     SupCompanyDao supCompanyDao;

src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.purchase.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.purchase.SupManufacturerDao;
 import com.glxp.api.entity.purchase.SupManufacturerEntity;
@@ -16,7 +17,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class SupManufacturerServiceImpl implements SupManufacturerService {
+public class SupManufacturerServiceImpl extends ServiceImpl<SupManufacturerDao, SupManufacturerEntity> implements SupManufacturerService {
 
     @Resource
     SupManufacturerDao supManufacturerDao;

src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java

@@ -3,6 +3,7 @@ package com.glxp.api.service.purchase.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 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.constant.ConstantStatus;
 import com.glxp.api.dao.purchase.SupProductDao;
@@ -19,7 +20,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class SupProductServiceImpl implements SupProductService {
+public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProductEntity> implements SupProductService {
 
     @Resource
     SupProductDao supProductDao;
@@ -82,17 +83,17 @@ public class SupProductServiceImpl implements SupProductService {
     }
 
     @Override
-    public SupProductEntity findByManufactury(String cpmctymc, String manufactory,String manufacturerIdFk) {
+    public SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk) {
 
-        QueryWrapper<SupProductEntity> ew=new QueryWrapper<>();
+        QueryWrapper<SupProductEntity> ew = new QueryWrapper<>();
-        if(StrUtil.isNotEmpty(manufactory)){
+        if (StrUtil.isNotEmpty(manufactory)) {
-            ew.eq("manufactory",manufactory);
+            ew.eq("manufactory", manufactory);
         }
-        if(StrUtil.isNotEmpty(cpmctymc)){
+        if (StrUtil.isNotEmpty(cpmctymc)) {
-            ew.eq("recordProductName",cpmctymc);
+            ew.eq("recordProductName", cpmctymc);
         }
-        if(StrUtil.isNotEmpty(manufacturerIdFk)){
+        if (StrUtil.isNotEmpty(manufacturerIdFk)) {
-            ew.eq("manufacturerIdFk",manufacturerIdFk);
+            ew.eq("manufacturerIdFk", manufacturerIdFk);
         }
         ew.last("limit 1");
         List<SupProductEntity> supProductEntities = supProductDao.selectList(ew);

src/main/java/com/glxp/api/service/sync/BasicExportService.java

@@ -1,12 +1,14 @@
 package com.glxp.api.service.sync;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.dao.sync.BasicExportDao;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.req.sync.BasicExportStatusRequest;
 
 import java.util.List;
 
-public interface BasicExportService {
+public interface BasicExportService extends IService<BasicExportStatusEntity> {
 
 
     BasicExportStatusEntity findByData(String idDatas, Integer status);

src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java

@@ -1,12 +1,13 @@
 package com.glxp.api.service.sync;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
 import com.glxp.api.req.sync.BasicExportTimeRequest;
 
 import java.util.List;
 
-public interface BasicExportTimeService {
+public interface BasicExportTimeService extends IService<BasicExportStatusTimeEntity> {
 
 
     BasicExportStatusTimeEntity findByType(String type);

src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java

@@ -1,14 +1,17 @@
 package com.glxp.api.service.sync;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
-import com.glxp.api.constant.BasicProcessStatus;
+import com.glxp.api.constant.*;
-import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.dao.basic.BasicProductsDao;
-import com.glxp.api.entity.basic.ProductInfoEntity;
+import com.glxp.api.entity.basic.*;
-import com.glxp.api.entity.basic.UdiCompanyEntity;
 import com.glxp.api.entity.inout.*;
+import com.glxp.api.entity.purchase.*;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
 import com.glxp.api.entity.sync.SyncDataBustypeEntity;
@@ -19,25 +22,39 @@ import com.glxp.api.req.sync.SpsSyncDataRequest;
 import com.glxp.api.res.sync.SpSyncUdiResponse;
 import com.glxp.api.res.sync.SpsSyncOrderResponse;
 import com.glxp.api.res.system.SyncDataSetResponse;
-import com.glxp.api.service.basic.ProductInfoService;
+import com.glxp.api.service.basic.*;
-import com.glxp.api.service.basic.UdiCompanyService;
 import com.glxp.api.service.inout.*;
+import com.glxp.api.service.purchase.*;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.DateUtil;
+import com.glxp.api.util.JsonUtils;
+import com.glxp.api.util.RedisUtil;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.io.File;
-import java.util.Date;
+import java.io.FileWriter;
-import java.util.List;
+import java.io.IOException;
+import java.util.*;
+import java.util.function.Function;
 
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class SpsSyncDownloadService {
 
 
+    private final Logger logger = LoggerFactory.getLogger(SpsSyncDownloadService.class);
+
+
+    private final RedisUtil redisUtil;
+
     //已完成扫码单据
     @Resource
     IoOrderService orderService;
@@ -109,6 +126,353 @@ public class SpsSyncDownloadService {
     }
 
 
+    private final BasicHospTypeService hospTypeService;
+
+    private final UdiRelevanceService udiRelevanceService;
+
+    private final BasicProductsDao basicProductsDao;
+
+    private final CompanyProductRelevanceService relevanceService;
+
+    private final BasicCorpService corpService;
+
+    private final SupCertService supCertService;
+
+    private final SupCertSetService supCertSetService;
+
+    private final SupCompanyService supCompanyService;
+
+    private final SupManufacturerService supManufacturerService;
+
+    private final SupProductService supProductService;
+
+    @Value("${file_path}")
+    private String filePath;
+
+    /**
+     * 同步基础数据模块
+     *
+     * @param info 同步设置
+     */
+    public void syncBasicData(SyncDataSetResponse info) {
+
+        Date now = new Date();
+        //是否需要执行
+        boolean needExec = info.getBasicProducts() == 2 || info.getBasicCorp() == 2 || info.getSupCert() == 2;
+        if (!needExec) {
+            return;
+        }
+        try {
+            basicExportInfoCreate(BasicExportTypeEnum.BASIC_DATA, now, this.getClass()
+                    , x -> x.generateBasicDataFile(info, now, false)
+                    , x -> x.generateBasicDataFile(info, now, true));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    /**
+     * 创建一个同步任务
+     *
+     * @param exportEnum       任务类型枚举
+     * @param hasDataMethod    判断时候有无数据方法
+     * @param createFileMethod 执行文件生成方法
+     * @return
+     * @throws Exception
+     */
+    private void basicExportInfoCreate(BasicExportTypeEnum exportEnum, Date now
+            , Class<? extends SpsSyncDownloadService> clazz, Function<SpsSyncDownloadService, Boolean> hasDataMethod, Function<SpsSyncDownloadService, Boolean> createFileMethod) throws Exception {
+        //防止出现同时调用问题
+        String redisKey = String.format("spsm-sync-create:%s", exportEnum.getKey());
+        boolean result = redisUtil.setIfAbsent(redisKey, 1, 10);
+        if (!result) {
+            String errorMsg = String.format("syncIdcSps----process------------同步[%s]重复进入", exportEnum.getRemark());
+//            logger.info(errorMsg);
+            throw new Exception(errorMsg);
+        }
+        BasicExportStatusEntity exportStatus = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class)
+                .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA.getRemark())
+                .orderByDesc(BasicExportStatusEntity::getStartTime)
+                .last("limit 1")
+        );
+
+        //首次任务or上次任务结束
+        if (exportStatus == null || BasicExportStatusEnum.COMPLETED.getCode().equals(exportStatus.getStatus())) {
+
+            //判断有无新数据
+            Boolean hasData = hasDataMethod.apply(this);
+            if (Boolean.FALSE.equals(hasData)) {
+                return;
+            }
+            exportStatus = BasicExportStatusEntity.builder()
+                    .id(CustomUtil.getId())
+                    .status(BasicExportStatusEnum.WAIT_TRIGGERED.getCode())
+                    .type(BasicExportTypeEnum.BASIC_DATA.getRemark())
+                    .scheduleType(0)
+                    .updateTime(cn.hutool.core.date.DateUtil.date())
+                    .startTime(now)
+                    .build();
+            basicExportService.save(exportStatus);
+        } else if (exportStatus.getStatus().equals(BasicExportStatusEnum.WAIT_BUILT.getCode())) {//文件待生成
+            createFileMethod.apply(this);
+        }
+    }
+
+    /**
+     * 读取基础数据，创建文件
+     *
+     * @param info       同步设置信息
+     * @param now        当前时间
+     * @param createFile 是否创建文件
+     * @return 是否有数据 true/false  有新数据/无新数据
+     */
+    protected boolean generateBasicDataFile(SyncDataSetResponse info, Date now, boolean createFile) {
+        //文件数据
+        Map<String, List> jsonMap = new WeakHashMap<>(4);
+        Map<BasicExportStatusTimeEnum, Map<String, Object>> totalTimeMap = new WeakHashMap<>(10);
+        try {
+            //确认有开启物资字典由外向内同步
+            if (info.getBasicProducts() == 2) {
+                Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_PRODUCTS, createFile);
+                totalTimeMap.put(BasicExportStatusTimeEnum.BASIC_PRODUCTS, map);
+                List<BasicHospTypeEntity> hospTypeList = hospTypeService.list(Wrappers.lambdaQuery(BasicHospTypeEntity.class)
+                        .le((boolean) map.get("isNew"), BasicHospTypeEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), BasicHospTypeEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(hospTypeList)) {
+                    jsonMap.put(BasicExportStatusTimeEntity.class.getName(), hospTypeList);
+                }
+                List<UdiRelevanceEntity> udiRelevanceList = udiRelevanceService.list(Wrappers.lambdaQuery(UdiRelevanceEntity.class)
+                        .le((boolean) map.get("isNew"), UdiRelevanceEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), UdiRelevanceEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(udiRelevanceList)) {
+                    jsonMap.put(UdiRelevanceEntity.class.getName(), udiRelevanceList);
+                }
+                List<BasicProductsEntity> productsList = basicProductsDao.selectList(Wrappers.lambdaQuery(BasicProductsEntity.class)
+                        .le((boolean) map.get("isNew"), BasicProductsEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), BasicProductsEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(productsList)) {
+                    jsonMap.put(BasicProductsEntity.class.getName(), productsList);
+                }
+                List<CompanyProductRelevanceEntity> relevanceList = relevanceService.list(Wrappers.lambdaQuery(CompanyProductRelevanceEntity.class)
+                        .le((boolean) map.get("isNew"), CompanyProductRelevanceEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), CompanyProductRelevanceEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(relevanceList)) {
+                    jsonMap.put(CompanyProductRelevanceEntity.class.getName(), relevanceList);
+                }
+            }
+            //确认有开启往来单位字典同步
+            if (info.getBasicCorp() == 2) {
+                Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_CORP, createFile);
+                totalTimeMap.put(BasicExportStatusTimeEnum.BASIC_CORP, map);
+                List<BasicCorpEntity> corpList = corpService.list(Wrappers.lambdaQuery(BasicCorpEntity.class)
+                        .le((boolean) map.get("isNew"), BasicCorpEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), BasicCorpEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(corpList)) {
+                    jsonMap.put(BasicCorpEntity.class.getName(), corpList);
+                }
+            }
+
+            //确认有开启首营资质同步
+            if (info.getSupCert() == 2) {
+                Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SUP_CERT, createFile);
+                totalTimeMap.put(BasicExportStatusTimeEnum.SUP_CERT, map);
+                List<SupCertEntity> supCertList = supCertService.list(Wrappers.lambdaQuery(SupCertEntity.class)
+                        .le((boolean) map.get("isNew"), SupCertEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), SupCertEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(supCertList)) {
+                    jsonMap.put(SupCertEntity.class.getName(), supCertList);
+                }
+                List<SupCertSetEntity> supCertSetList = supCertSetService.list(Wrappers.lambdaQuery(SupCertSetEntity.class)
+                        .le((boolean) map.get("isNew"), SupCertSetEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), SupCertSetEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(supCertSetList)) {
+                    jsonMap.put(SupCertSetEntity.class.getName(), supCertSetList);
+                }
+                List<SupCompanyEntity> supCompanyList = supCompanyService.list(Wrappers.lambdaQuery(SupCompanyEntity.class)
+                        .le((boolean) map.get("isNew"), SupCompanyEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), SupCompanyEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(supCompanyList)) {
+                    jsonMap.put(SupCompanyEntity.class.getName(), supCompanyList);
+                }
+                List<SupManufacturerEntity> supManufacturerList = supManufacturerService.list(Wrappers.lambdaQuery(SupManufacturerEntity.class)
+                        .le((boolean) map.get("isNew"), SupManufacturerEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), SupManufacturerEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(supManufacturerList)) {
+                    jsonMap.put(SupManufacturerEntity.class.getName(), supManufacturerList);
+                }
+                List<SupProductEntity> supProductList = supProductService.list(Wrappers.lambdaQuery(SupProductEntity.class)
+                        .le((boolean) map.get("isNew"), SupProductEntity::getUpdateTime, now)
+                        .between(!(boolean) map.get("isNew"), SupProductEntity::getUpdateTime
+                                , map.get("oldDate"), now)
+                );
+                if (CollectionUtil.isNotEmpty(supProductList)) {
+                    jsonMap.put(SupProductEntity.class.getName(), supProductList);
+                }
+
+            }
+
+            if (jsonMap.size() > 0) {
+                if (!createFile) {
+                    return true;
+                }
+                try {
+                    String fileFullPath = writeFile(filePath, BasicExportTypeEnum.BASIC_DATA.getRemark(), JsonUtils.toJsonString(jsonMap));
+                    //计算总数
+                    int total = 0;
+                    for (List l : jsonMap.values()) {
+                        total += l.size();
+                    }
+                    try {
+                        //插入一条任务数据
+                        boolean update = basicExportService.update(Wrappers.lambdaUpdate(BasicExportStatusEntity.class)
+                                .set(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_SYNC.getCode())
+                                .set(BasicExportStatusEntity::getUpdateTime, new Date())
+                                .set(BasicExportStatusEntity::getCacheFilePath, fileFullPath)
+                                .set(BasicExportStatusEntity::getRemark, String.format("%s: %s条", BasicExportStatusEnum.WAIT_SYNC.getRemark(), total))
+                                .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA.getRemark())
+                                .eq(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.WAIT_BUILT.getCode())
+                                .isNull(BasicExportStatusEntity::getCacheFilePath)
+                        );
+                    } catch (Exception e) {
+                        // 异常回滚
+                        this.exportTimeRollback(totalTimeMap, BasicExportTypeEnum.BASIC_DATA, fileFullPath);
+                    }
+                    return true;
+                } catch (IOException e) {
+                    logger.error(String.format("syncIdcSps----process------------生成[%s]文件及更改库操作异常，异常信息<%s>"
+                            , BasicExportTypeEnum.BASIC_DATA.getRemark(), e.getMessage()));
+                    // 异常回滚
+                    this.exportTimeRollback(totalTimeMap, BasicExportTypeEnum.BASIC_DATA, null);
+                }
+            }
+            return false;
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * 插入 basicExportStatusTime表
+     *
+     * @param date                 当前时间
+     * @param exportStatusTimeEnum key枚举
+     * @param createFile           是否需要创建文件，false时只做查询
+     * @return 最后一次同步时间  返回值需与参数 date 比较，判断是否相等
+     * @throws Exception
+     */
+    private Map<String, Object> basicExportStatusTimeInfo(Date date, BasicExportStatusTimeEnum exportStatusTimeEnum, boolean createFile) throws Exception {
+        //防止出现同时调用问题
+        String redisKey = String.format("spsm-sync-task:%s", exportStatusTimeEnum.getKey());
+        boolean result = redisUtil.setIfAbsent(redisKey, 1, 10);
+        if (!result) {
+            String errorMsg = String.format("syncIdcSps----process------------同步[%s]重复进入", exportStatusTimeEnum.getRemark());
+//            logger.info(errorMsg);
+            throw new Exception(errorMsg);
+        }
+        boolean isNew = true;
+        BasicExportStatusTimeEntity timeInfo = basicExportTimeService.getOne(Wrappers.lambdaQuery(BasicExportStatusTimeEntity.class)
+                .eq(BasicExportStatusTimeEntity::getKey, exportStatusTimeEnum.getKey()));
+        if (timeInfo == null) {
+            timeInfo = BasicExportStatusTimeEntity.builder()
+                    .key(exportStatusTimeEnum.getKey())
+                    .lastUpdateTime(DateUtil.formatDateTime(date))
+                    .remark(exportStatusTimeEnum.getRemark())
+                    .build();
+            if (createFile) {
+                basicExportTimeService.save(timeInfo);
+            }
+        } else {
+            if (StrUtil.isNotEmpty(timeInfo.getLastUpdateTime())) {
+                isNew = false;
+            }
+            if (createFile) {
+                basicExportTimeService.update(Wrappers.lambdaUpdate(BasicExportStatusTimeEntity.class)
+                        .set(BasicExportStatusTimeEntity::getLastUpdateTime, DateUtil.formatDateTime(date))
+                        .eq(BasicExportStatusTimeEntity::getKey, exportStatusTimeEnum.getKey())
+                );
+            }
+        }
+        redisUtil.del(redisKey);
+        WeakHashMap<String, Object> returnMap = new WeakHashMap<>(10);
+        returnMap.put("isNew", isNew);
+        returnMap.put("oldDate", isNew ? null : timeInfo.getLastUpdateTime());
+        returnMap.put("id", timeInfo.getId());
+
+        return returnMap;
+    }
+
+    /**
+     * 异常回滚操作
+     *
+     * @param totalTimeMap 总的exportTime数据回滚
+     * @param delFilePath  需要删除的文件地址
+     */
+    private void exportTimeRollback(Map<BasicExportStatusTimeEnum, Map<String, Object>> totalTimeMap, BasicExportTypeEnum exportType, String delFilePath) {
+        for (Map.Entry<BasicExportStatusTimeEnum, Map<String, Object>> entry : totalTimeMap.entrySet()) {
+            //防止出现同时调用问题
+            String redisKey = String.format("spsm-sync-rollback:%s", entry.getKey().getKey());
+            boolean result = redisUtil.setIfAbsent(redisKey, 1, 10);
+            if (!result) {
+                String errorMsg = String.format("syncIdcSps----process------------同步回滚[%s]重复进入", entry.getKey().getRemark());
+                logger.error(errorMsg);
+            }
+            if ((boolean) entry.getValue().get("isNew")) {
+                basicExportTimeService.deleteById(entry.getValue().get("id").toString());
+            } else {
+                basicExportTimeService.update(Wrappers.lambdaUpdate(BasicExportStatusTimeEntity.class)
+                        .set(BasicExportStatusTimeEntity::getLastUpdateTime, entry.getValue().get("oldDate"))
+                        .eq(BasicExportStatusTimeEntity::getKey, entry.getKey().getKey())
+                        .eq(BasicExportStatusTimeEntity::getId, entry.getValue().get("id"))
+                );
+            }
+        }
+        if (StrUtil.isNotBlank(delFilePath)) {
+            try {
+                File file = new File(delFilePath);
+                file.deleteOnExit();
+            } catch (Exception e) {
+                String errorMsg = String.format("syncIdcSps----process------------同步回滚[%s]删除文件异常", exportType.getRemark());
+                logger.error(errorMsg);
+            }
+        }
+
+    }
+
+
+    private String writeFile(String filePath, String fileDesc, String content) throws IOException {
+        String fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, DateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID());
+        File file = new File(fileFullPath);
+        while (!file.createNewFile()) {
+            fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, DateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID());
+            file = new File(fileFullPath);
+        }
+        FileWriter fileWriter = new FileWriter(file);
+        fileWriter.write(content);
+        fileWriter.flush();
+        fileWriter.close();
+        return fileFullPath;
+    }
+
     //获取需要同步信息
     public BaseResponse findOrder(SpsSyncDataRequest spsSyncDataRequest) {
         SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse();
@@ -229,4 +593,5 @@ public class SpsSyncDownloadService {
         spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
         return spsSyncDataRequest;
     }
+
 }

src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.sync.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.sync.BasicExportDao;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
@@ -15,7 +16,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class BasicExportServiceImpl implements BasicExportService {
+public class BasicExportServiceImpl extends ServiceImpl<BasicExportDao,BasicExportStatusEntity> implements BasicExportService {
 
     @Resource
     BasicExportDao basicExportDao;

src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.sync.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.sync.BasicExportTimeDao;
 import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
 import com.glxp.api.req.sync.BasicExportTimeRequest;
@@ -14,7 +15,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class BasicExportTimeServiceImpl implements BasicExportTimeService {
+public class BasicExportTimeServiceImpl extends ServiceImpl<BasicExportTimeDao, BasicExportStatusTimeEntity> implements BasicExportTimeService {
 
     @Resource
     BasicExportTimeDao basicExportTimeDao;

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceBizServiceImpl.java

@@ -1,16 +1,15 @@
 package com.glxp.api.service.system.impl;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
-import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity;
 import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
 import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
 import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -23,11 +22,11 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla
     @Override
     public List<SysPdfTemplateRelevanceBizEntity> getListByModelId(Integer modelId) {
 
-        QueryWrapper<SysPdfTemplateRelevanceBizEntity> ew=new QueryWrapper();
+        QueryWrapper<SysPdfTemplateRelevanceBizEntity> ew = new QueryWrapper();
-        if(modelId!=null){
+        if (modelId != null) {
-            ew.eq("moduleId",modelId);
+            ew.eq("moduleId", modelId);
         }
-        List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntityList=sysPdfTemplateRelevanceBizDao.selectList(ew);
+        List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntityList = sysPdfTemplateRelevanceBizDao.selectList(ew);
 
         return sysPdfTemplateRelevanceBizEntityList;
     }
@@ -39,19 +38,19 @@ public class SystemPDFTemplateRelevanceBizServiceImpl implements SystemPDFTempla
 
     @Override
     public boolean udpateRl(SysPdfTemplateRelevanceBizEntity systemPDFTemplateRelevanceEntity) {
+        systemPDFTemplateRelevanceEntity.setUpdateTime(new Date());
+        int count = sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity);
 
-       int count= sysPdfTemplateRelevanceBizDao.updateById(systemPDFTemplateRelevanceEntity);
+        if (count > 0) {
-
+            return true;
-       if(count>0){
+        } else {
-           return true;
+            return false;
-       }else{
+        }
-           return false;
-       }
     }
 
     @Override
     public boolean insert(SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity) {
-
+        sysPdfTemplateRelevanceBizEntity.setUpdateTime(new Date());
         sysPdfTemplateRelevanceBizDao.upInsert(sysPdfTemplateRelevanceBizEntity);
 
         return true;

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceCodeServiceImpl.java

@@ -1,18 +1,15 @@
 package com.glxp.api.service.system.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao;
 import com.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao;
-import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
 import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
 import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
-import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService;
 import com.glxp.api.service.system.SystemPDFTemplateRelevanceCodeService;
-import com.glxp.api.service.system.SystemPDFTemplateRelevanceService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -25,11 +22,11 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl
     @Override
     public List<SysPdfTemplateRelevanceCodeEntity> getListByModelId(Integer modelId) {
 
-        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew=new QueryWrapper();
+        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew = new QueryWrapper();
-        if(modelId!=null){
+        if (modelId != null) {
-            ew.eq("moduleId",modelId);
+            ew.eq("moduleId", modelId);
         }
-        List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntityList=sysPdfTemplateRelevanceCodeDao.selectList(ew);
+        List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntityList = sysPdfTemplateRelevanceCodeDao.selectList(ew);
 
         return sysPdfTemplateRelevanceCodeEntityList;
     }
@@ -42,34 +39,34 @@ public class SystemPDFTemplateRelevanceCodeServiceImpl implements SystemPDFTempl
     @Override
     public List<SysPdfTemplateRelevanceCodeEntity> selectList(FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
 
-        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew=new QueryWrapper<>();
+        QueryWrapper<SysPdfTemplateRelevanceCodeEntity> ew = new QueryWrapper<>();
-        if(filterPdfTemplateRelevanceRequest.getModelKey()!=null){
+        if (filterPdfTemplateRelevanceRequest.getModelKey() != null) {
-            ew.eq("modelKey",filterPdfTemplateRelevanceRequest.getModelKey());
+            ew.eq("modelKey", filterPdfTemplateRelevanceRequest.getModelKey());
         }
         return sysPdfTemplateRelevanceCodeDao.selectList(ew);
     }
 
     @Override
     public boolean udpateRl(SysPdfTemplateRelevanceCodeEntity systemPDFTemplateRelevanceEntity) {
+        systemPDFTemplateRelevanceEntity.setUpdateTime(new Date());
+        int count = sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity);
 
-       int count= sysPdfTemplateRelevanceCodeDao.updateById(systemPDFTemplateRelevanceEntity);
+        if (count > 0) {
-
+            return true;
-       if(count>0){
+        } else {
-           return true;
+            return false;
-       }else{
+        }
-           return false;
-       }
     }
 
     @Override
     public boolean insert(SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity) {
-
+        sysPdfTemplateRelevanceCodeEntity.setUpdateTime(new Date());
         sysPdfTemplateRelevanceCodeDao.upInsert(sysPdfTemplateRelevanceCodeEntity);
         return false;
     }
 
     @Override
     public SysPdfTemplateRelevanceCodeEntity selectNameAndAction(String name, String localAction) {
-        return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name,localAction);
+        return sysPdfTemplateRelevanceCodeDao.selectNameAndAction(name, localAction);
     }
 }

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceLabelServiceImpl.java

@@ -6,10 +6,10 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
 import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
 import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
 import com.glxp.api.service.system.SystemPDFTemplateRelevanceLabelService;
-import com.glxp.api.service.system.SystemPDFTemplateRelevanceLabelService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp
     @Override
     public List<SysPdfTemplateRelevanceLabelEntity> getListByModelId(Integer modelId) {
 
-        QueryWrapper<SysPdfTemplateRelevanceLabelEntity> ew=new QueryWrapper();
+        QueryWrapper<SysPdfTemplateRelevanceLabelEntity> ew = new QueryWrapper();
-        if(modelId!=null){
+        if (modelId != null) {
-            ew.eq("moduleId",modelId);
+            ew.eq("moduleId", modelId);
         }
-        List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntityList=sysPdfTemplateRelevanceLabelDao.selectList(ew);
+        List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntityList = sysPdfTemplateRelevanceLabelDao.selectList(ew);
 
         return sysPdfTemplateRelevanceLabelEntityList;
     }
@@ -38,13 +38,13 @@ public class SystemPDFTemplateRelevanceLabelServiceImpl implements SystemPDFTemp
 
     @Override
     public boolean udpateRl(SysPdfTemplateRelevanceLabelEntity systemPDFTemplateRelevanceEntity) {
+        systemPDFTemplateRelevanceEntity.setUpdateTime(new Date());
+        int count = sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity);
 
-       int count= sysPdfTemplateRelevanceLabelDao.updateById(systemPDFTemplateRelevanceEntity);
+        if (count > 0) {
-
+            return true;
-       if(count>0){
+        } else {
-           return true;
+            return false;
-       }else{
+        }
-           return false;
-       }
     }
 }

src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceStatemenServiceImpl.java

@@ -6,10 +6,10 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
 import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
 import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
 import com.glxp.api.service.system.SystemPDFTemplateRelevanceStatemenService;
-import com.glxp.api.service.system.SystemPDFTemplateRelevanceStatemenService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -22,11 +22,11 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT
     @Override
     public List<SysPdfTemplateRelevanceStatemenEntity> getListByModelId(Integer modelId) {
 
-        QueryWrapper<SysPdfTemplateRelevanceStatemenEntity> ew=new QueryWrapper();
+        QueryWrapper<SysPdfTemplateRelevanceStatemenEntity> ew = new QueryWrapper();
-        if(modelId!=null){
+        if (modelId != null) {
-            ew.eq("moduleId",modelId);
+            ew.eq("moduleId", modelId);
         }
-        List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntityList=sysPdfTemplateRelevanceStatemenDao.selectList(ew);
+        List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntityList = sysPdfTemplateRelevanceStatemenDao.selectList(ew);
 
         return sysPdfTemplateRelevanceStatemenEntityList;
     }
@@ -38,13 +38,13 @@ public class SystemPDFTemplateRelevanceStatemenServiceImpl implements SystemPDFT
 
     @Override
     public boolean udpateRl(SysPdfTemplateRelevanceStatemenEntity systemPDFTemplateRelevanceEntity) {
+        systemPDFTemplateRelevanceEntity.setUpdateTime(new Date());
+        int count = sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity);
 
-       int count= sysPdfTemplateRelevanceStatemenDao.updateById(systemPDFTemplateRelevanceEntity);
+        if (count > 0) {
-
+            return true;
-       if(count>0){
+        } else {
-           return true;
+            return false;
-       }else{
+        }
-           return false;
-       }
     }
 }

src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -69,18 +70,18 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService {
 
     @Override
     public boolean updateById(SysParamConfigSaveRequest sysParamConfigSaveRequest) {
-
+        sysParamConfigSaveRequest.setUpdateTime(new Date());
         return systemParamConfigDao.updateById(sysParamConfigSaveRequest);
     }
 
     @Override
     public boolean updateParentId(SysParamConfigSaveRequest sysParamConfigSaveRequest) {
-
         return systemParamConfigDao.updateParentId(sysParamConfigSaveRequest);
     }
 
     @Override
     public boolean insert(SystemParamConfigEntity systemParamConfigEntity) {
+        systemParamConfigEntity.setUpdateTime(new Date());
         return systemParamConfigDao.insert(systemParamConfigEntity);
     }
 

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

@@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -79,6 +80,7 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
 
     @Override
     public boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) {
+        thrInvWarehouseEntity.setUpdateTime(new Date());
         return thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity);
     }
 
@@ -89,6 +91,7 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
 
     @Override
     public boolean updateThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) {
+        thrInvWarehouseEntity.setUpdateTime(new Date());
         return thrInvWarehouseDao.updateThrInvWarehouse(thrInvWarehouseEntity);
     }
 

src/main/java/com/glxp/api/task/AsyncHeartTask.java

@@ -67,7 +67,7 @@ public class AsyncHeartTask implements SchedulingConfigurer {
                 if (curTime - lastTime > timeInterval) {
                     spsSyncDownloadService.syncDiProductsTask();
 //                    todo 生成任务都写在这
-
+                    spsSyncDownloadService.syncBasicData(syncDataSetEntity);
                     redisUtil.set("SPS_SYNC_GEN_DATA", curTime);
                 }
             }

src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -46,7 +46,7 @@
         SELECT *
         FROM auth_user
         <where>
-            userName = #{userName}
+            binary userName = #{userName}
         </where>
         LIMIT 1
     </select>

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

@@ -30,4 +30,71 @@
             </if>
         </where>
     </select>
+
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.basic.BasicBusTypeChangeEntity" useGeneratedKeys="true">
+        insert into basic_bustype_change
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            originAction,
+            originName,
+            targetAction,
+            `type`,
+            `enable`,
+            `createUser`,
+            updateUser,
+            createTime,
+            updateTime,
+            remark,
+            auditStatus,
+            busAuditStatus,
+            targetBusAction,
+            beforeTime,
+            busBeforeTime,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{originAction,jdbcType=VARCHAR},
+            #{originName,jdbcType=VARCHAR},
+            #{targetAction,jdbcType=VARCHAR},
+            #{type,jdbcType=TINYINT},
+            #{enable,jdbcType=TINYINT},
+            #{createUser,jdbcType=VARCHAR},
+            #{updateUser,jdbcType=VARCHAR},
+            #{createTime,jdbcType=TIMESTAMP},
+            #{updateTime,jdbcType=TIMESTAMP},
+            #{remark,jdbcType=VARCHAR},
+            #{auditStatus,jdbcType=TINYINT},
+            #{busAuditStatus,jdbcType=TINYINT},
+            #{targetBusAction,jdbcType=VARCHAR},
+            #{beforeTime,jdbcType=TINYINT},
+            #{busBeforeTime,jdbcType=TINYINT},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            originAction    = #{originAction,jdbcType=VARCHAR},
+            originName      = #{originName,jdbcType=VARCHAR},
+            targetAction    = #{targetAction,jdbcType=VARCHAR},
+            `type`          = #{type,jdbcType=TINYINT},
+            `enable`        = #{enable,jdbcType=TINYINT},
+            `createUser`    = #{createUser,jdbcType=VARCHAR},
+            updateUser      = #{updateUser,jdbcType=VARCHAR},
+            createTime      = #{createTime,jdbcType=TIMESTAMP},
+            updateTime      = #{updateTime,jdbcType=TIMESTAMP},
+            remark          = #{remark,jdbcType=VARCHAR},
+            auditStatus     = #{auditStatus,jdbcType=TINYINT},
+            busAuditStatus  = #{busAuditStatus,jdbcType=TINYINT},
+            targetBusAction = #{targetBusAction,jdbcType=VARCHAR},
+            beforeTime      = #{beforeTime,jdbcType=TINYINT},
+            busBeforeTime   = #{busBeforeTime,jdbcType=TINYINT},
+        </trim>
+    </insert>
+
 </mapper>

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

@@ -61,4 +61,89 @@
             </if>
         </where>
     </select>
+
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.basic.BasicBusTypePreEntity" useGeneratedKeys="true">
+        insert into basic_bustype_pre
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            intro,
+            `action`,
+            `index`,
+            beforeTime,
+            changeType,
+            defaultDeptCode,
+            defaultInvCode,
+            deptCode,
+            invCode,
+            originAction,
+            changeEnable,
+            supplementAll,
+            `createUser`,
+            updateUser,
+            createTime,
+            updateTime,
+            remark,
+            targetBusAction,
+            busBeforeTime,
+            auditStatus,
+            busAuditStatus,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{intro,jdbcType=VARCHAR},
+            #{action,jdbcType=VARCHAR},
+            #{index,jdbcType=TINYINT},
+            #{beforeTime,jdbcType=INTEGER},
+            #{changeType,jdbcType=TINYINT},
+            #{defaultDeptCode,jdbcType=VARCHAR},
+            #{defaultInvCode,jdbcType=VARCHAR},
+            #{deptCode,jdbcType=VARCHAR},
+            #{invCode,jdbcType=VARCHAR},
+            #{originAction,jdbcType=VARCHAR},
+            #{changeEnable,jdbcType=TINYINT},
+            #{supplementAll,jdbcType=TINYINT},
+            #{createUser,jdbcType=VARCHAR},
+            #{updateUser,jdbcType=VARCHAR},
+            #{createTime,jdbcType=TIMESTAMP},
+            #{updateTime,jdbcType=TIMESTAMP},
+            #{remark,jdbcType=VARCHAR},
+            #{targetBusAction,jdbcType=VARCHAR},
+            #{busBeforeTime,jdbcType=TINYINT},
+            #{auditStatus,jdbcType=TINYINT},
+            #{busAuditStatus,jdbcType=TINYINT},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            intro           = #{intro,jdbcType=VARCHAR},
+            `action`        = #{action,jdbcType=VARCHAR},
+            `index`         = #{index,jdbcType=TINYINT},
+            beforeTime      = #{beforeTime,jdbcType=INTEGER},
+            changeType      = #{changeType,jdbcType=TINYINT},
+            defaultDeptCode = #{defaultDeptCode,jdbcType=VARCHAR},
+            defaultInvCode  = #{defaultInvCode,jdbcType=VARCHAR},
+            deptCode        = #{deptCode,jdbcType=VARCHAR},
+            invCode         = #{invCode,jdbcType=VARCHAR},
+            originAction    = #{originAction,jdbcType=VARCHAR},
+            changeEnable    = #{changeEnable,jdbcType=TINYINT},
+            supplementAll   = #{supplementAll,jdbcType=TINYINT},
+            `createUser`    = #{createUser,jdbcType=VARCHAR},
+            updateUser      = #{updateUser,jdbcType=VARCHAR},
+            createTime      = #{createTime,jdbcType=TIMESTAMP},
+            updateTime      = #{updateTime,jdbcType=TIMESTAMP},
+            remark          = #{remark,jdbcType=VARCHAR},
+            targetBusAction = #{targetBusAction,jdbcType=VARCHAR},
+            busBeforeTime   = #{busBeforeTime,jdbcType=TINYINT},
+            auditStatus     = #{auditStatus,jdbcType=TINYINT},
+            busAuditStatus  = #{busAuditStatus,jdbcType=TINYINT},
+        </trim>
+    </insert>
+
 </mapper>

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

@@ -58,7 +58,7 @@
 
     <insert id="insertIgnoreBussinessType" parameterType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
         insert
-            ignore
+                ignore
         into basic_bussiness_type (mainAction, action, name, enable, remark, thirdSysFk, genUnit, innerOrder,
                                    secCheckEnable, checkEnable, checkUdims, checkPdaEd, checkPdaUn, checkPc,
                                    checkWebNew, checkSp, checkChange, secCheckUdims, secCheckPdaEd, secCheckPdaUn,
@@ -70,7 +70,7 @@
                                    vailGroupBuy, busType, inStock, actionType, thrCheckEnable, thrCheckWebNew,
                                    thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp,
                                    thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate,
-                                   checkExpire, checkCertExpire,preInBackAction,    backPreinType)
+                                   checkExpire, checkCertExpire, preInBackAction, backPreinType, checkPreInOrders)
         values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder},
                 #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc},
                 #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn},
@@ -82,7 +82,7 @@
                 #{vailGroupBuy}, #{busType}, #{inStock}, #{actionType}, #{thrCheckEnable}, #{thrCheckWebNew},
                 #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp},
                 #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate},
-                #{checkExpire}, #{checkCertExpire},#{preInBackAction},#{backPreinType})
+                #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, #{checkPreInOrders})
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
@@ -151,13 +151,13 @@
         where mainAction = #{mainAction}
           and corpType = 3
           and (supplementOrderType is null
-            or supplementOrderType = '')
+                or supplementOrderType = '')
     </select>
 
     <select id="selectByUser" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
         select basic_bussiness_type.*
         from basic_bussiness_type
-                 inner join auth_user_bustype on basic_bussiness_type.action = auth_user_bustype.scAction
+                     inner join auth_user_bustype on basic_bussiness_type.action = auth_user_bustype.scAction
         <where>
             <if test="name != null and name != ''">
                 AND basic_bussiness_type.name like concat('%', #{name}, '%')
@@ -188,7 +188,7 @@
             resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse">
         SELECT basic_bussiness_type.*
         FROM basic_bussiness_type
-                 left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction
+                     left JOIN auth_user_bustype ON basic_bussiness_type.action = auth_user_bustype.scAction
         <where>
             <if test="name != ''and name != null">
                 AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')
@@ -226,7 +226,7 @@
             resultType="com.glxp.api.res.basic.BasicBussinessTypeResponse">
         SELECT basic_bussiness_type.*
         FROM basic_bussiness_type
-                 left JOIN auth_warehouse_bustype ON basic_bussiness_type.action = auth_warehouse_bustype.action
+                     left JOIN auth_warehouse_bustype ON basic_bussiness_type.action = auth_warehouse_bustype.action
         <where>
             <if test="name != ''and name != null">
                 AND basic_bussiness_type.name LIKE concat('%', #{name}, '%')

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

@@ -162,4 +162,62 @@
         DELETE
         FROM basic_entrust_accept
     </delete>
+
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.basic.EntrustReceEntity" useGeneratedKeys="true">
+        insert into basic_entrust_accept
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            `action`,
+            curDept,
+            curInv,
+            userId,
+            entrustDept,
+            entrustInv,
+            entrustAction,
+            entrustUser,
+            finishRece,
+            updateTime,
+            remark,
+            entrustEnd,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{action,jdbcType=VARCHAR},
+            #{curDept,jdbcType=VARCHAR},
+            #{curInv,jdbcType=VARCHAR},
+            #{userId,jdbcType=VARCHAR},
+            #{entrustDept,jdbcType=VARCHAR},
+            #{entrustInv,jdbcType=VARCHAR},
+            #{entrustAction,jdbcType=VARCHAR},
+            #{entrustUser,jdbcType=VARCHAR},
+            #{finishRece,jdbcType=TINYINT},
+            #{updateTime,jdbcType=TIMESTAMP},
+            #{remark,jdbcType=VARCHAR},
+            #{entrustEnd,jdbcType=TINYINT},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            `action` = #{action,jdbcType=VARCHAR},
+            curDept = #{curDept,jdbcType=VARCHAR},
+            curInv = #{curInv,jdbcType=VARCHAR},
+            userId = #{userId,jdbcType=VARCHAR},
+            entrustDept = #{entrustDept,jdbcType=VARCHAR},
+            entrustInv = #{entrustInv,jdbcType=VARCHAR},
+            entrustAction = #{entrustAction,jdbcType=VARCHAR},
+            entrustUser = #{entrustUser,jdbcType=VARCHAR},
+            finishRece = #{finishRece,jdbcType=TINYINT},
+            updateTime = #{updateTime,jdbcType=TIMESTAMP},
+            remark = #{remark,jdbcType=VARCHAR},
+            entrustEnd = #{entrustEnd,jdbcType=TINYINT},
+        </trim>
+    </insert>
+
 </mapper>

src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml

@@ -21,7 +21,8 @@
                auth_dept.name      deptName,
                auth_warehouse.name invName,
                ipp.deptCode,
-               ipp.invCode
+               ipp.invCode,
+               bp.measname
         from inv_pre_product ipp
                  inner join basic_udirel on ipp.relIdFk = basic_udirel.id
                  inner join basic_products bp on basic_udirel.uuid = bp.uuid

src/main/resources/mybatis/mapper/schedule/SystemParamConfigDao.xml

@@ -52,6 +52,7 @@
             <if test="paramStatus != null">paramStatus=#{paramStatus},</if>
             <if test="paramType != null">paramType=#{paramType},</if>
             <if test="paramExplain != null">paramExplain=#{paramExplain},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
         </set>
         WHERE id=#{id}
     </update>
@@ -66,16 +67,63 @@
 
     <insert id="insert" parameterType="com.glxp.api.entity.system.SystemParamConfigEntity">
         insert INTO sys_param_config(paramName,
-                                     paramKey, paramValue, paramStatus, paramType, paramExplain)
+                                     paramKey, paramValue, paramStatus, paramType, paramExplain, updateTime)
         values (#{paramName},
                 #{paramKey},
                 #{paramValue},
                 #{paramStatus},
                 #{paramType},
-                #{paramExplain})
+                #{paramExplain},
+                #{updateTime}
+        )
     </insert>
 
     <select id="selectValueByParamKey" resultType="java.lang.String">
         select paramValue from sys_param_config where paramKey = #{key}
     </select>
+
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.system.SystemParamConfigEntity" useGeneratedKeys="true">
+        insert into sys_param_config
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            parentId,
+            paramName,
+            paramKey,
+            paramValue,
+            paramStatus,
+            paramType,
+            paramExplain,
+            updateTime,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{parentId,jdbcType=INTEGER},
+            #{paramName,jdbcType=VARCHAR},
+            #{paramKey,jdbcType=VARCHAR},
+            #{paramValue,jdbcType=VARCHAR},
+            #{paramStatus,jdbcType=INTEGER},
+            #{paramType,jdbcType=INTEGER},
+            #{paramExplain,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=DATE},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            parentId = #{parentId,jdbcType=INTEGER},
+            paramName = #{paramName,jdbcType=VARCHAR},
+            paramKey = #{paramKey,jdbcType=VARCHAR},
+            paramValue = #{paramValue,jdbcType=VARCHAR},
+            paramStatus = #{paramStatus,jdbcType=INTEGER},
+            paramType = #{paramType,jdbcType=INTEGER},
+            paramExplain = #{paramExplain,jdbcType=VARCHAR},
+            updateTime = #{updateTime,jdbcType=DATE},
+        </trim>
+    </insert>
 </mapper>

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml

@@ -1,78 +1,139 @@
 <?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.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    <!--@Table sys_pdf_template_relevance_biz-->
+        <!--@Table sys_pdf_template_relevance_biz-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
-    <result column="templateId" jdbcType="INTEGER" property="templateId" />
+        <result column="templateId" jdbcType="INTEGER" property="templateId"/>
-    <result column="customerId" jdbcType="BIGINT" property="customerId" />
+        <result column="customerId" jdbcType="BIGINT" property="customerId"/>
-    <result column="adminId" jdbcType="INTEGER" property="adminId" />
+        <result column="adminId" jdbcType="INTEGER" property="adminId"/>
-    <result column="moduleId" jdbcType="INTEGER" property="moduleId" />
+        <result column="moduleId" jdbcType="INTEGER" property="moduleId"/>
-    <result column="localAction" jdbcType="VARCHAR" property="localAction" />
+        <result column="localAction" jdbcType="VARCHAR" property="localAction"/>
-    <result column="remark1" jdbcType="VARCHAR" property="remark1" />
+        <result column="remark1" jdbcType="VARCHAR" property="remark1"/>
-    <result column="remark2" jdbcType="VARCHAR" property="remark2" />
+        <result column="remark2" jdbcType="VARCHAR" property="remark2"/>
-    <result column="remark3" jdbcType="VARCHAR" property="remark3" />
+        <result column="remark3" jdbcType="VARCHAR" property="remark3"/>
-    <result column="printType" jdbcType="TINYINT" property="printType" />
+        <result column="printType" jdbcType="TINYINT" property="printType"/>
-    <result column="modelKey" jdbcType="VARCHAR" property="modelKey" />
+        <result column="modelKey" jdbcType="VARCHAR" property="modelKey"/>
-  </resultMap>
+    </resultMap>
-  <sql id="Base_Column_List">
+    <sql id="Base_Column_List">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, 
+        id,
-    printType, modelKey
+        templateId,
-  </sql>
+        customerId,
+        adminId,
+        moduleId,
+        localAction,
+        remark1,
+        remark2,
+        remark3,
+        printType,
+        modelKey
+    </sql>
 
 
-  <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
+    <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
-          resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
+            resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
-    SELECT
+        SELECT basic_bustype_change.`originName` localActionName,
-    basic_bustype_change.`originName` localActionName,
+               sys_pdf_template_relevance_biz.id,
-    sys_pdf_template_relevance_biz.id,
+               basic_bustype_change.originAction localAction,
-    basic_bustype_change.originAction localAction,
+               templateId,
-    templateId,
+               moduleId,
-    moduleId,
+               sys_pdf_template.NAME             templateName,
-    sys_pdf_template.NAME templateName,
+               sys_pdf_template_relevance_biz.remark1,
-    sys_pdf_template_relevance_biz.remark1,
+               sys_pdf_template_relevance_biz.remark2,
-    sys_pdf_template_relevance_biz.remark2,
+               sys_pdf_template_relevance_biz.remark3,
-    sys_pdf_template_relevance_biz.remark3,
+               printType
-    printType
+        FROM basic_bustype_change
-    FROM
+                 LEFT JOIN sys_pdf_template_relevance_biz
-    basic_bustype_change
+                           ON basic_bustype_change.originAction = sys_pdf_template_relevance_biz.localAction
-    LEFT JOIN sys_pdf_template_relevance_biz ON basic_bustype_change.originAction = sys_pdf_template_relevance_biz.localAction
+                 LEFT JOIN sys_pdf_template ON sys_pdf_template_relevance_biz.templateId = sys_pdf_template.id
-    LEFT JOIN sys_pdf_template ON sys_pdf_template_relevance_biz.templateId = sys_pdf_template.id
+        <where>
-    <where>
+            <if test="moduleId != null">
-      <if test="moduleId != null">
+                AND `moduleId` = #{moduleId}
-        AND `moduleId` = #{moduleId}
+            </if>
-      </if>
+            <if test="localAction != null">
-      <if test="localAction != null">
+                AND sys_pdf_template_relevance_biz.`localAction` = #{localAction}
-        AND sys_pdf_template_relevance_biz.`localAction` = #{localAction}
+            </if>
-      </if>
+            <if test="templateType != null">
-      <if test="templateType != null">
+                AND sys_pdf_template_relevance_biz.`templateType` = #{templateType}
-        AND sys_pdf_template_relevance_biz.`templateType` = #{templateType}
+            </if>
-      </if>
+            <if test="modelKey != null">
-      <if test="modelKey != null">
+                AND sys_pdf_template_relevance_biz.`modelKey` = #{modelKey}
-        AND sys_pdf_template_relevance_biz.`modelKey` = #{modelKey}
+            </if>
-      </if>
+        </where>
-    </where>
+    </select>
-  </select>
 
-  <insert id="upInsert" parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
+    <insert id="upInsert" parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
-    insert
+        insert
-    ignore
+            ignore
         INTO sys_pdf_template_relevance_biz
-        (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey)
+        (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey, updateTime)
         values (#{templateId},
-    #{customerId},
+                #{customerId},
-    #{adminId},
+                #{adminId},
-    #{moduleId},
+                #{moduleId},
-    #{localAction},
+                #{localAction},
-    #{remark1},
+                #{remark1},
-    #{remark2},
+                #{remark2},
-    #{remark3},
+                #{remark3},
-    #{printType},
+                #{printType},
-    #{modelKey}
+                #{modelKey},
-)
+                #{updateTime})
-  </insert>
+    </insert>
-
 
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity" useGeneratedKeys="true">
+        insert into sys_pdf_template_relevance_biz
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            templateId,
+            customerId,
+            adminId,
+            moduleId,
+            localAction,
+            remark1,
+            remark2,
+            remark3,
+            printType,
+            modelKey,
+            updateTime,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{templateId,jdbcType=INTEGER},
+            #{customerId,jdbcType=BIGINT},
+            #{adminId,jdbcType=INTEGER},
+            #{moduleId,jdbcType=INTEGER},
+            #{localAction,jdbcType=VARCHAR},
+            #{remark1,jdbcType=VARCHAR},
+            #{remark2,jdbcType=VARCHAR},
+            #{remark3,jdbcType=VARCHAR},
+            #{printType,jdbcType=TINYINT},
+            #{modelKey,jdbcType=VARCHAR},
+            #{updateTime, jdbcType=DATE},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            templateId  = #{templateId,jdbcType=INTEGER},
+            customerId  = #{customerId,jdbcType=BIGINT},
+            adminId     = #{adminId,jdbcType=INTEGER},
+            moduleId    = #{moduleId,jdbcType=INTEGER},
+            localAction = #{localAction,jdbcType=VARCHAR},
+            remark1     = #{remark1,jdbcType=VARCHAR},
+            remark2     = #{remark2,jdbcType=VARCHAR},
+            remark3     = #{remark3,jdbcType=VARCHAR},
+            printType   = #{printType,jdbcType=TINYINT},
+            modelKey    = #{modelKey,jdbcType=VARCHAR},
+            updateTime    = #{updateTime,jdbcType=DATE},
+        </trim>
+    </insert>
 </mapper>

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml

@@ -1,89 +1,151 @@
 <?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.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    <!--@Table sys_pdf_template_relevance_code-->
+        <!--@Table sys_pdf_template_relevance_code-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
-    <result column="templateId" jdbcType="INTEGER" property="templateId" />
+        <result column="templateId" jdbcType="INTEGER" property="templateId"/>
-    <result column="customerId" jdbcType="BIGINT" property="customerId" />
+        <result column="customerId" jdbcType="BIGINT" property="customerId"/>
-    <result column="adminId" jdbcType="INTEGER" property="adminId" />
+        <result column="adminId" jdbcType="INTEGER" property="adminId"/>
-    <result column="moduleId" jdbcType="INTEGER" property="moduleId" />
+        <result column="moduleId" jdbcType="INTEGER" property="moduleId"/>
-    <result column="localAction" jdbcType="VARCHAR" property="localAction" />
+        <result column="localAction" jdbcType="VARCHAR" property="localAction"/>
-    <result column="remark1" jdbcType="VARCHAR" property="remark1" />
+        <result column="remark1" jdbcType="VARCHAR" property="remark1"/>
-    <result column="remark2" jdbcType="VARCHAR" property="remark2" />
+        <result column="remark2" jdbcType="VARCHAR" property="remark2"/>
-    <result column="remark3" jdbcType="VARCHAR" property="remark3" />
+        <result column="remark3" jdbcType="VARCHAR" property="remark3"/>
-    <result column="printType" jdbcType="TINYINT" property="printType" />
+        <result column="printType" jdbcType="TINYINT" property="printType"/>
-    <result column="modelKey" jdbcType="VARCHAR" property="modelKey" />
+        <result column="modelKey" jdbcType="VARCHAR" property="modelKey"/>
-  </resultMap>
+    </resultMap>
-  <sql id="Base_Column_List">
+    <sql id="Base_Column_List">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, 
+        id,
-    printType, modelKey
+        templateId,
-  </sql>
+        customerId,
+        adminId,
+        moduleId,
+        localAction,
+        remark1,
+        remark2,
+        remark3,
+        printType,
+        modelKey
+    </sql>
 
 
-  <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
+    <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
-          resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
+            resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
-    select basic_bussiness_type.`name` localActionName,
+        select basic_bussiness_type.`name` localActionName,
-    sys_pdf_template_relevance_code.id,
+               sys_pdf_template_relevance_code.id,
-    basic_bussiness_type.action localAction,
+               basic_bussiness_type.action localAction,
-    templateId,
+               templateId,
-    moduleId,
+               moduleId,
-    sys_pdf_template.name       templateName,
+               sys_pdf_template.name       templateName,
-    sys_pdf_template_relevance_code.remark1,
+               sys_pdf_template_relevance_code.remark1,
-    sys_pdf_template_relevance_code.remark2,
+               sys_pdf_template_relevance_code.remark2,
-    sys_pdf_template_relevance_code.remark3,
+               sys_pdf_template_relevance_code.remark3,
-    printType
+               printType
-    from basic_bussiness_type
+        from basic_bussiness_type
-    LEFT JOIN sys_pdf_template_relevance_code  on basic_bussiness_type.action = sys_pdf_template_relevance_code.localAction
+                 LEFT JOIN sys_pdf_template_relevance_code
-    LEFT JOIN sys_pdf_template on sys_pdf_template_relevance_code.templateId = sys_pdf_template.id
+                           on basic_bussiness_type.action = sys_pdf_template_relevance_code.localAction
-    <where>
+                 LEFT JOIN sys_pdf_template on sys_pdf_template_relevance_code.templateId = sys_pdf_template.id
-      <if test="moduleId != null">
+        <where>
-        AND `moduleId` = #{moduleId}
+            <if test="moduleId != null">
-      </if>
+                AND `moduleId` = #{moduleId}
-      <if test="localAction != null">
+            </if>
-        AND sys_pdf_template_relevance_code.`localAction` = #{localAction}
+            <if test="localAction != null">
-      </if>
+                AND sys_pdf_template_relevance_code.`localAction` = #{localAction}
-      <if test="templateType != null">
+            </if>
-        AND sys_pdf_template_relevance_code.`templateType` = #{templateType}
+            <if test="templateType != null">
-      </if>
+                AND sys_pdf_template_relevance_code.`templateType` = #{templateType}
-      <if test="modelKey != null">
+            </if>
-        AND sys_pdf_template_relevance_code.`modelKey` = #{modelKey}
+            <if test="modelKey != null">
-      </if>
+                AND sys_pdf_template_relevance_code.`modelKey` = #{modelKey}
-    </where>
+            </if>
-  </select>
+        </where>
+    </select>
 
-  <insert id="upInsert" parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
+    <insert id="upInsert" parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
-    insert
+        insert
-    ignore
+            ignore
         INTO sys_pdf_template_relevance_code
-        (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType,modelKey)
+        (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType, modelKey)
         values (#{templateId},
-    #{customerId},
+                #{customerId},
-    #{adminId},
+                #{adminId},
-    #{moduleId},
+                #{moduleId},
-    #{localAction},
+                #{localAction},
-    #{remark1},
+                #{remark1},
-    #{remark2},
+                #{remark2},
-    #{remark3},
+                #{remark3},
-    #{printType},
+                #{printType},
-    #{modelKey}
+                #{modelKey})
-    )
+    </insert>
-  </insert>
-
-  <select id="selectNameAndAction" resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
-    SELECT *
-    FROM sys_pdf_template_relevance_code
-    <where>
-      <if test="name != null">
-        AND `modelKey` = #{name}
-      </if>
-      <if test="localAction != null">
-        AND `localAction` = #{localAction}
-      </if>
-    </where>
-  </select>
 
+    <select id="selectNameAndAction" resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
+        SELECT *
+        FROM sys_pdf_template_relevance_code
+        <where>
+            <if test="name != null">
+                AND `modelKey` = #{name}
+            </if>
+            <if test="localAction != null">
+                AND `localAction` = #{localAction}
+            </if>
+        </where>
+    </select>
 
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity" useGeneratedKeys="true">
+        insert into sys_pdf_template_relevance_code
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            templateId,
+            customerId,
+            adminId,
+            moduleId,
+            localAction,
+            remark1,
+            remark2,
+            remark3,
+            printType,
+            modelKey,
+            updateTime,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{templateId,jdbcType=INTEGER},
+            #{customerId,jdbcType=BIGINT},
+            #{adminId,jdbcType=INTEGER},
+            #{moduleId,jdbcType=INTEGER},
+            #{localAction,jdbcType=VARCHAR},
+            #{remark1,jdbcType=VARCHAR},
+            #{remark2,jdbcType=VARCHAR},
+            #{remark3,jdbcType=VARCHAR},
+            #{printType,jdbcType=TINYINT},
+            #{modelKey,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=DATE},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            templateId  = #{templateId,jdbcType=INTEGER},
+            customerId  = #{customerId,jdbcType=BIGINT},
+            adminId     = #{adminId,jdbcType=INTEGER},
+            moduleId    = #{moduleId,jdbcType=INTEGER},
+            localAction = #{localAction,jdbcType=VARCHAR},
+            remark1     = #{remark1,jdbcType=VARCHAR},
+            remark2     = #{remark2,jdbcType=VARCHAR},
+            remark3     = #{remark3,jdbcType=VARCHAR},
+            printType   = #{printType,jdbcType=TINYINT},
+            modelKey    = #{modelKey,jdbcType=VARCHAR},
+            updateTime  = #{updateTime,jdbcType=DATE},
+        </trim>
+    </insert>
 </mapper>

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml

@@ -1,56 +1,117 @@
 <?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.glxp.api.dao.system.SysPdfTemplateRelevanceLabelDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    <!--@Table sys_pdf_template_relevance_label-->
+        <!--@Table sys_pdf_template_relevance_label-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
-    <result column="templateId" jdbcType="INTEGER" property="templateId" />
+        <result column="templateId" jdbcType="INTEGER" property="templateId"/>
-    <result column="customerId" jdbcType="BIGINT" property="customerId" />
+        <result column="customerId" jdbcType="BIGINT" property="customerId"/>
-    <result column="adminId" jdbcType="INTEGER" property="adminId" />
+        <result column="adminId" jdbcType="INTEGER" property="adminId"/>
-    <result column="moduleId" jdbcType="INTEGER" property="moduleId" />
+        <result column="moduleId" jdbcType="INTEGER" property="moduleId"/>
-    <result column="localAction" jdbcType="VARCHAR" property="localAction" />
+        <result column="localAction" jdbcType="VARCHAR" property="localAction"/>
-    <result column="remark1" jdbcType="VARCHAR" property="remark1" />
+        <result column="remark1" jdbcType="VARCHAR" property="remark1"/>
-    <result column="remark2" jdbcType="VARCHAR" property="remark2" />
+        <result column="remark2" jdbcType="VARCHAR" property="remark2"/>
-    <result column="remark3" jdbcType="VARCHAR" property="remark3" />
+        <result column="remark3" jdbcType="VARCHAR" property="remark3"/>
-    <result column="printType" jdbcType="TINYINT" property="printType" />
+        <result column="printType" jdbcType="TINYINT" property="printType"/>
-    <result column="modelKey" jdbcType="VARCHAR" property="modelKey" />
+        <result column="modelKey" jdbcType="VARCHAR" property="modelKey"/>
-  </resultMap>
+    </resultMap>
-  <sql id="Base_Column_List">
+    <sql id="Base_Column_List">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, 
+        id,
-    printType, modelKey
+        templateId,
-  </sql>
+        customerId,
+        adminId,
+        moduleId,
+        localAction,
+        remark1,
+        remark2,
+        remark3,
+        printType,
+        modelKey
+    </sql>
 
-  <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
+    <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
-          resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
+            resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
-    SELECT
+        SELECT sys_pdf_template_relevance_label.id,
-    sys_pdf_template_relevance_label.id,
+               sys_pdf_template_relevance_label.localAction localActionName,
-    sys_pdf_template_relevance_label.localAction localActionName,
+               templateId,
-    templateId,
+               moduleId,
-    moduleId,
+               sys_pdf_template.NAME                        templateName,
-    sys_pdf_template.NAME templateName,
+               sys_pdf_template_relevance_label.remark1,
-    sys_pdf_template_relevance_label.remark1,
+               sys_pdf_template_relevance_label.remark2,
-    sys_pdf_template_relevance_label.remark2,
+               sys_pdf_template_relevance_label.remark3,
-    sys_pdf_template_relevance_label.remark3,
+               printType
-    printType
+        FROM sys_pdf_template_relevance_label
-    FROM
+                 LEFT JOIN sys_pdf_template ON sys_pdf_template_relevance_label.templateId = sys_pdf_template.id
-    sys_pdf_template_relevance_label
+        <where>
-    LEFT JOIN sys_pdf_template ON sys_pdf_template_relevance_label.templateId = sys_pdf_template.id
+            <if test="moduleId != null">
-    <where>
+                AND `moduleId` = #{moduleId}
-      <if test="moduleId != null">
+            </if>
-        AND `moduleId` = #{moduleId}
+            <if test="localAction != null">
-      </if>
+                AND sys_pdf_template_relevance_label.`localAction` = #{localAction}
-      <if test="localAction != null">
+            </if>
-        AND sys_pdf_template_relevance_label.`localAction` = #{localAction}
+            <if test="templateType != null">
-      </if>
+                AND sys_pdf_template_relevance_label.`templateType` = #{templateType}
-      <if test="templateType != null">
+            </if>
-        AND sys_pdf_template_relevance_label.`templateType` = #{templateType}
+            <if test="modelKey != null">
-      </if>
+                AND sys_pdf_template_relevance_label.`modelKey` = #{modelKey}
-      <if test="modelKey != null">
+            </if>
-        AND sys_pdf_template_relevance_label.`modelKey` = #{modelKey}
+        </where>
-      </if>
+    </select>
-    </where>
-  </select>
 
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity" useGeneratedKeys="true">
+        insert into sys_pdf_template_relevance_label
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            templateId,
+            customerId,
+            adminId,
+            moduleId,
+            localAction,
+            remark1,
+            remark2,
+            remark3,
+            printType,
+            modelKey,
+            updateTime,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{templateId,jdbcType=INTEGER},
+            #{customerId,jdbcType=BIGINT},
+            #{adminId,jdbcType=INTEGER},
+            #{moduleId,jdbcType=INTEGER},
+            #{localAction,jdbcType=VARCHAR},
+            #{remark1,jdbcType=VARCHAR},
+            #{remark2,jdbcType=VARCHAR},
+            #{remark3,jdbcType=VARCHAR},
+            #{printType,jdbcType=TINYINT},
+            #{modelKey,jdbcType=VARCHAR},
+            #{updateTime, jdbcType=DATE},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            templateId  = #{templateId,jdbcType=INTEGER},
+            customerId  = #{customerId,jdbcType=BIGINT},
+            adminId     = #{adminId,jdbcType=INTEGER},
+            moduleId    = #{moduleId,jdbcType=INTEGER},
+            localAction = #{localAction,jdbcType=VARCHAR},
+            remark1     = #{remark1,jdbcType=VARCHAR},
+            remark2     = #{remark2,jdbcType=VARCHAR},
+            remark3     = #{remark3,jdbcType=VARCHAR},
+            printType   = #{printType,jdbcType=TINYINT},
+            modelKey    = #{modelKey,jdbcType=VARCHAR},
+            updateTime  = #{updateTime,jdbcType=DATE},
+        </trim>
+    </insert>
 </mapper>

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml

@@ -1,57 +1,115 @@
 <?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.glxp.api.dao.system.SysPdfTemplateRelevanceStatemenDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    <!--@Table sys_pdf_template_relevance_statemen-->
+        <!--@Table sys_pdf_template_relevance_statemen-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
-    <result column="templateId" jdbcType="INTEGER" property="templateId" />
+        <result column="templateId" jdbcType="INTEGER" property="templateId"/>
-    <result column="customerId" jdbcType="BIGINT" property="customerId" />
+        <result column="customerId" jdbcType="BIGINT" property="customerId"/>
-    <result column="adminId" jdbcType="INTEGER" property="adminId" />
+        <result column="adminId" jdbcType="INTEGER" property="adminId"/>
-    <result column="moduleId" jdbcType="INTEGER" property="moduleId" />
+        <result column="moduleId" jdbcType="INTEGER" property="moduleId"/>
-    <result column="localAction" jdbcType="VARCHAR" property="localAction" />
+        <result column="localAction" jdbcType="VARCHAR" property="localAction"/>
-    <result column="remark1" jdbcType="VARCHAR" property="remark1" />
+        <result column="remark1" jdbcType="VARCHAR" property="remark1"/>
-    <result column="remark2" jdbcType="VARCHAR" property="remark2" />
+        <result column="remark2" jdbcType="VARCHAR" property="remark2"/>
-    <result column="remark3" jdbcType="VARCHAR" property="remark3" />
+        <result column="remark3" jdbcType="VARCHAR" property="remark3"/>
-    <result column="printType" jdbcType="TINYINT" property="printType" />
+        <result column="printType" jdbcType="TINYINT" property="printType"/>
-    <result column="modelKey" jdbcType="VARCHAR" property="modelKey" />
+        <result column="modelKey" jdbcType="VARCHAR" property="modelKey"/>
-  </resultMap>
+    </resultMap>
-  <sql id="Base_Column_List">
+    <sql id="Base_Column_List">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    id, templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, 
+        id,
-    printType, modelKey
+        templateId,
-  </sql>
+        customerId,
+        adminId,
+        moduleId,
+        localAction,
+        remark1,
+        remark2,
+        remark3,
+        printType,
+        modelKey
+    </sql>
 
 
-  <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
+    <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
-          resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
+            resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
-    SELECT
+        SELECT sys_pdf_template_relevance_statemen.id,
-    sys_pdf_template_relevance_statemen.id,
+               sys_pdf_template_relevance_statemen.localAction localActionName,
-    sys_pdf_template_relevance_statemen.localAction localActionName,
+               templateId,
-    templateId,
+               moduleId,
-    moduleId,
+               sys_pdf_template.NAME                           templateName,
-    sys_pdf_template.NAME templateName,
+               sys_pdf_template_relevance_statemen.remark1,
-    sys_pdf_template_relevance_statemen.remark1,
+               sys_pdf_template_relevance_statemen.remark2,
-    sys_pdf_template_relevance_statemen.remark2,
+               sys_pdf_template_relevance_statemen.remark3,
-    sys_pdf_template_relevance_statemen.remark3,
+               printType
-    printType
+        FROM sys_pdf_template_relevance_statemen
-    FROM
+                 LEFT JOIN sys_pdf_template ON sys_pdf_template_relevance_statemen.templateId = sys_pdf_template.id
-    sys_pdf_template_relevance_statemen
+        <where>
-    LEFT JOIN sys_pdf_template ON sys_pdf_template_relevance_statemen.templateId = sys_pdf_template.id
+            <if test="moduleId != null">
-    <where>
+                AND `moduleId` = #{moduleId}
-      <if test="moduleId != null">
+            </if>
-        AND `moduleId` = #{moduleId}
+            <if test="localAction != null">
-      </if>
+                AND sys_pdf_template_relevance_statemen.`localAction` = #{localAction}
-      <if test="localAction != null">
+            </if>
-        AND sys_pdf_template_relevance_statemen.`localAction` = #{localAction}
+            <if test="templateType != null">
-      </if>
+                AND sys_pdf_template_relevance_statemen.`templateType` = #{templateType}
-      <if test="templateType != null">
+            </if>
-        AND sys_pdf_template_relevance_statemen.`templateType` = #{templateType}
+            <if test="modelKey != null">
-      </if>
+                AND sys_pdf_template_relevance_statemen.`modelKey` = #{modelKey}
-      <if test="modelKey != null">
+            </if>
-        AND sys_pdf_template_relevance_statemen.`modelKey` = #{modelKey}
+        </where>
-      </if>
+    </select>
-    </where>
-  </select>
 
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity" useGeneratedKeys="true">
+        insert into sys_pdf_template_relevance_statemen
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            templateId,
+            customerId,
+            adminId,
+            moduleId,
+            localAction,
+            remark1,
+            remark2,
+            remark3,
+            printType,
+            modelKey,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{templateId,jdbcType=INTEGER},
+            #{customerId,jdbcType=BIGINT},
+            #{adminId,jdbcType=INTEGER},
+            #{moduleId,jdbcType=INTEGER},
+            #{localAction,jdbcType=VARCHAR},
+            #{remark1,jdbcType=VARCHAR},
+            #{remark2,jdbcType=VARCHAR},
+            #{remark3,jdbcType=VARCHAR},
+            #{printType,jdbcType=TINYINT},
+            #{modelKey,jdbcType=VARCHAR},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            templateId  = #{templateId,jdbcType=INTEGER},
+            customerId  = #{customerId,jdbcType=BIGINT},
+            adminId     = #{adminId,jdbcType=INTEGER},
+            moduleId    = #{moduleId,jdbcType=INTEGER},
+            localAction = #{localAction,jdbcType=VARCHAR},
+            remark1     = #{remark1,jdbcType=VARCHAR},
+            remark2     = #{remark2,jdbcType=VARCHAR},
+            remark3     = #{remark3,jdbcType=VARCHAR},
+            printType   = #{printType,jdbcType=TINYINT},
+            modelKey    = #{modelKey,jdbcType=VARCHAR},
+        </trim>
+    </insert>
 </mapper>

src/main/resources/mybatis/mapper/system/SystemPDFModuleDao.xml

@@ -2,24 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.system.SystemPDFModuleDao">
-
     <select id="queryPage" parameterType="com.glxp.api.req.system.FilterPdfModuleRequest"
             resultType="com.glxp.api.entity.system.SystemPDFModuleEntity">
-        SELECT id,name,param,fieldExplain,remark,templateId,create_time,update_time,templateDlUrl,templateType
+        SELECT id
-        ,remark1,remark2,remark3,modelKey
+             , name
+             , param
+             , fieldExplain
+             , remark
+             , templateId
+             , create_time
+             , update_time
+             , templateDlUrl
+             , templateType
+             , remark1
+             , remark2
+             , remark3
+             , modelKey
         FROM sys_pdf_module
         <where>
             <if test="templateId != null and '' != templateId">
-                AND `templateId` LIKE CONCAT(#{templateId},'%')
+                AND `templateId` LIKE CONCAT(#{templateId}, '%')
             </if>
             <if test="modelKey != null and '' != modelKey">
-                AND `modelKey` LIKE CONCAT(#{modelKey},'%')
+                AND `modelKey` LIKE CONCAT(#{modelKey}, '%')
             </if>
             <if test="name != null and '' != name">
-                AND `name` LIKE CONCAT('%',#{name},'%')
+                AND `name` LIKE CONCAT('%', #{name}, '%')
             </if>
             <if test="templateType != null">
-                AND templateType=#{templateType}
+                AND templateType = #{templateType}
             </if>
         </where>
     </select>
@@ -46,32 +57,53 @@
     </select>
 
 
-
     <update id="updateById" parameterType="com.glxp.api.entity.system.SystemPDFModuleEntity">
         UPDATE sys_pdf_module
         <set>
-            <if test="name != null">name=#{name},</if>
+            <if test="name != null">
-            <if test="param != null">param=#{param},</if>
+                name=#{name},
-            <if test="fieldExplain != null">fieldExplain=#{fieldExplain},</if>
+            </if>
-            <if test="remark != null">remark=#{remark},</if>
+            <if test="param != null">
-            <if test="templateId != null">templateId=#{templateId},</if>
+                param=#{param},
-            <if test="create_time != null">create_time=#{create_time},</if>
+            </if>
-            <if test="update_time != null">update_time=#{update_time},</if>
+            <if test="fieldExplain != null">
-            <if test="templateDlUrl != null">templateDlUrl=#{templateDlUrl},</if>
+                fieldExplain=#{fieldExplain},
-            <if test="templateType != null">templateType=#{templateType},</if>
+            </if>
-            <if test="remark1 != null">remark1=#{remark1},</if>
+            <if test="remark != null">
-            <if test="remark2 != null">remark2=#{remark2},</if>
+                remark=#{remark},
-            <if test="remark3 != null">remark3=#{remark3},</if>
+            </if>
-
+            <if test="templateId != null">
-
+                templateId=#{templateId},
+            </if>
+            <if test="create_time != null">
+                create_time=#{create_time},
+            </if>
+            <if test="update_time != null">
+                update_time=#{update_time},
+            </if>
+            <if test="templateDlUrl != null">
+                templateDlUrl=#{templateDlUrl},
+            </if>
+            <if test="templateType != null">
+                templateType=#{templateType},
+            </if>
+            <if test="remark1 != null">
+                remark1=#{remark1},
+            </if>
+            <if test="remark2 != null">
+                remark2=#{remark2},
+            </if>
+            <if test="remark3 != null">
+                remark3=#{remark3},
+            </if>
         </set>
-        WHERE id=#{id}
+        WHERE id = #{id}
     </update>
 
     <insert id="insert" parameterType="com.glxp.api.entity.system.SystemPDFModuleEntity">
         insert INTO sys_pdf_module( name, param, fieldExplain, remark, templateId, create_time, update_time
-                                     , templateDlUrl, templateType
+                                  , templateDlUrl, templateType
-                                     , remark1, remark2, remark3)
+                                  , remark1, remark2, remark3)
         values (#{name},
                 #{param},
                 #{fieldExplain},
@@ -92,4 +124,65 @@
         from sys_pdf_module
         where id = #{id}
     </delete>
+
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.entity.system.SystemPDFModuleEntity" useGeneratedKeys="true">
+        insert into sys_pdf_module
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            `name`,
+            param,
+            fieldExplain,
+            remark,
+            templateId,
+            create_time,
+            update_time,
+            templateDlUrl,
+            templateType,
+            remark1,
+            remark2,
+            remark3,
+            modelKey,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{name,jdbcType=VARCHAR},
+            #{param,jdbcType=VARCHAR},
+            #{fieldExplain,jdbcType=VARCHAR},
+            #{remark,jdbcType=VARCHAR},
+            #{templateId,jdbcType=INTEGER},
+            #{create_time,jdbcType=TIMESTAMP},
+            #{update_time,jdbcType=TIMESTAMP},
+            #{templateDlUrl,jdbcType=VARCHAR},
+            #{templateType,jdbcType=INTEGER},
+            #{remark1,jdbcType=VARCHAR},
+            #{remark2,jdbcType=VARCHAR},
+            #{remark3,jdbcType=VARCHAR},
+            #{modelKey,jdbcType=VARCHAR},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            `name`        = #{name,jdbcType=VARCHAR},
+            param         = #{param,jdbcType=VARCHAR},
+            fieldExplain  = #{fieldExplain,jdbcType=VARCHAR},
+            remark        = #{remark,jdbcType=VARCHAR},
+            templateId    = #{templateId,jdbcType=INTEGER},
+            create_time   = #{create_time,jdbcType=TIMESTAMP},
+            update_time   = #{update_time,jdbcType=TIMESTAMP},
+            templateDlUrl = #{templateDlUrl,jdbcType=VARCHAR},
+            templateType  = #{templateType,jdbcType=INTEGER},
+            remark1       = #{remark1,jdbcType=VARCHAR},
+            remark2       = #{remark2,jdbcType=VARCHAR},
+            remark3       = #{remark3,jdbcType=VARCHAR},
+            modelKey      = #{modelKey,jdbcType=VARCHAR},
+        </trim>
+    </insert>
 </mapper>

src/main/resources/mybatis/mapper/system/SystemPDFTemplateDao.xml

@@ -2,16 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.system.SystemPDFTemplateDao">
-
     <select id="queryPage" parameterType="com.glxp.api.req.system.FilterPdfTemplateRequest"
             resultType="com.glxp.api.entity.system.SystemPDFTemplateEntity">
-        SELECT id,name,type,module,param,path,rowCount,qrcodeCount,remark,create_time,update_time as update_time,jrxmlPath,bussinessType,bussinessStatus
+        SELECT id,
+               name,
+               type,
+               module,
+               param,
+               path,
+               rowCount,
+               qrcodeCount,
+               remark,
+               create_time,
+               update_time as update_time,
+               jrxmlPath,
+               bussinessType,
+               bussinessStatus
         FROM sys_pdf_template
         <where>
             <if test="name != null and '' != name">
-                AND `name` LIKE CONCAT('%',#{name},'%')
+                AND `name` LIKE CONCAT('%', #{name}, '%')
             </if>
-            <if test="module != null ">
+            <if test="module != null">
                 AND `module` = #{module}
             </if>
         </where>
@@ -35,28 +47,53 @@
     <update id="updateById" parameterType="com.glxp.api.entity.system.SystemPDFTemplateEntity">
         UPDATE sys_pdf_template
         <set>
-            <if test="name != null">name=#{name},</if>
+            <if test="name != null">
-            <if test="type != null">type=#{type},</if>
+                name=#{name},
-            <if test="module != null">module=#{module},</if>
+            </if>
-            <if test="param != null">param=#{param},</if>
+            <if test="type != null">
-            <if test="path != null">path=#{path},</if>
+                type=#{type},
-            <if test="rowCount != null">rowCount=#{rowCount},</if>
+            </if>
-            <if test="qrcodeCount != null">qrcodeCount=#{qrcodeCount},</if>
+            <if test="module != null">
-            <if test="remark != null">remark=#{remark},</if>
+                module=#{module},
-            <if test="create_time != null">create_time=#{create_time},</if>
+            </if>
-            <if test="update_time != null">update_time=#{update_time},</if>
+            <if test="param != null">
-            <if test="jrxmlPath != null">jrxmlPath=#{jrxmlPath},</if>
+                param=#{param},
-            <if test="bussinessType != null">bussinessType=#{bussinessType},</if>
+            </if>
-            <if test="bussinessStatus != null">bussinessStatus=#{bussinessStatus},</if>
+            <if test="path != null">
-
+                path=#{path},
+            </if>
+            <if test="rowCount != null">
+                rowCount=#{rowCount},
+            </if>
+            <if test="qrcodeCount != null">
+                qrcodeCount=#{qrcodeCount},
+            </if>
+            <if test="remark != null">
+                remark=#{remark},
+            </if>
+            <if test="create_time != null">
+                create_time=#{create_time},
+            </if>
+            <if test="update_time != null">
+                update_time=#{update_time},
+            </if>
+            <if test="jrxmlPath != null">
+                jrxmlPath=#{jrxmlPath},
+            </if>
+            <if test="bussinessType != null">
+                bussinessType=#{bussinessType},
+            </if>
+            <if test="bussinessStatus != null">
+                bussinessStatus=#{bussinessStatus},
+            </if>
         </set>
-        WHERE id=#{id}
+        WHERE id = #{id}
     </update>
 
     <insert id="insert" parameterType="com.glxp.api.entity.system.SystemPDFTemplateEntity">
         insert INTO sys_pdf_template(name,
-                                        type, module, param, path, rowCount, qrcodeCount, remark, create_time,
+                                     type, module, param, path, rowCount, qrcodeCount, remark, create_time,
-                                        update_time, jrxmlPath,bussinessType,bussinessStatus)
+                                     update_time, jrxmlPath, bussinessType, bussinessStatus)
         values (#{name},
                 #{type},
                 #{module},
@@ -66,7 +103,7 @@
                 #{qrcodeCount},
                 #{remark},
                 #{create_time},
-                #{update_time}, #{jrxmlPath},#{bussinessType},#{bussinessStatus})
+                #{update_time}, #{jrxmlPath}, #{bussinessType}, #{bussinessStatus})
     </insert>
 
     <select id="listPDFTemplates" parameterType="java.lang.Integer"
@@ -80,4 +117,65 @@
         from sys_pdf_template
         where id = #{id}
     </delete>
+
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.entity.system.SystemPDFTemplateEntity" useGeneratedKeys="true">
+        insert into sys_pdf_template
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            `name`,
+            `type`,
+            `module`,
+            param,
+            `path`,
+            `rowCount`,
+            qrcodeCount,
+            remark,
+            create_time,
+            update_time,
+            jrxmlPath,
+            bussinessType,
+            bussinessStatus,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{name,jdbcType=VARCHAR},
+            #{type,jdbcType=INTEGER},
+            #{module,jdbcType=INTEGER},
+            #{param,jdbcType=VARCHAR},
+            #{path,jdbcType=VARCHAR},
+            #{rowCount,jdbcType=INTEGER},
+            #{qrcodeCount,jdbcType=INTEGER},
+            #{remark,jdbcType=VARCHAR},
+            #{create_time,jdbcType=TIMESTAMP},
+            #{update_time,jdbcType=TIMESTAMP},
+            #{jrxmlPath,jdbcType=VARCHAR},
+            #{bussinessType,jdbcType=VARCHAR},
+            #{bussinessStatus,jdbcType=VARCHAR},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            `name`          = #{name,jdbcType=VARCHAR},
+            `type`          = #{type,jdbcType=INTEGER},
+            `module`        = #{module,jdbcType=INTEGER},
+            param           = #{param,jdbcType=VARCHAR},
+            `path`          = #{path,jdbcType=VARCHAR},
+            `rowCount`      = #{rowCount,jdbcType=INTEGER},
+            qrcodeCount     = #{qrcodeCount,jdbcType=INTEGER},
+            remark          = #{remark,jdbcType=VARCHAR},
+            create_time     = #{create_time,jdbcType=TIMESTAMP},
+            update_time     = #{update_time,jdbcType=TIMESTAMP},
+            jrxmlPath       = #{jrxmlPath,jdbcType=VARCHAR},
+            bussinessType   = #{bussinessType,jdbcType=VARCHAR},
+            bussinessStatus = #{bussinessStatus,jdbcType=VARCHAR},
+        </trim>
+    </insert>
 </mapper>

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

@@ -2,22 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.thrsys.ThrCorpDao">
-
     <select id="filterThrCorps" parameterType="com.glxp.api.req.thrsys.FilterThrCorpRequest"
             resultType="com.glxp.api.res.thrsys.ThrCorpsResponse">
-        SELECT * FROM thr_corp
+        SELECT *
+        FROM thr_corp
         <where>
             <if test="unitId != '' and unitId != null">
-                AND unitId like concat('%',#{unitId},'%')
+                AND unitId like concat('%', #{unitId}, '%')
             </if>
             <if test="name != '' and name != null">
-                AND ( name LIKE concat('%',#{name},'%') or spell LIKE concat('%',#{name},'%') )
+                AND (name LIKE concat('%', #{name}, '%') or spell LIKE concat('%', #{name}, '%'))
             </if>
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
             </if>
-            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+            <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')   ]]>
+                <![CDATA[
+                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
         </where>
         ORDER BY updateTime DESC
@@ -26,54 +28,45 @@
 
     <insert id="insertThrCorps" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrCorpEntity">
         replace
-        INTO thr_corp
+            INTO thr_corp
-        (
+        (unitId, name, spell, addr, creditNo,
-        unitId,name,spell,addr,creditNo,
+         contact, mobile, thirdSysFk, updateTime, createUser, createTime, updateUser, remark)
-        contact,mobile,thirdSysFk,updateTime,createUser,createTime,updateUser,remark
+        values (#{unitId},
-        )
+                #{name},
-        values
+                #{spell},
-            (
+                #{addr},
-        #{unitId},
+                #{creditNo},
-        #{name},
+                #{contact},
-        #{spell},
+                #{mobile},
-        #{addr},
+                #{thirdSysFk},
-        #{creditNo},
+                #{updateTime},
-        #{contact},
+                #{createUser},
-        #{mobile},
+                #{createTime},
-        #{thirdSysFk},
+                #{updateUser},
-        #{updateTime},
+                #{remark})
-        #{createUser},
-        #{createTime},
-        #{updateUser},
-        #{remark}
-        )
     </insert>
 
     <insert id="insertThrCorpss" keyProperty="id" parameterType="java.util.List">
         replace INTO thr_corp
-        (
+        (unitId, name, spell, addr, creditNo,
-        unitId,name,spell,addr,creditNo,
+         contact, mobile, thirdSysFk, updateTime, createUser, createTime, updateUser, remark)
-        contact,mobile,thirdSysFk,updateTime,createUser,createTime,updateUser,remark
-        )
         values
 
         <foreach collection="thrCorpEntitys" item="item" index="index"
                  separator=",">
-            (
+            (#{item.unitId},
-            #{item.unitId},
+             #{item.name},
-            #{item.name},
+             #{item.spell},
-            #{item.spell},
+             #{item.addr},
-            #{item.addr},
+             #{item.creditNo},
-            #{item.creditNo},
+             #{item.contact},
-            #{item.contact},
+             #{item.mobile},
-            #{item.mobile},
+             #{item.thirdSysFk},
-            #{item.thirdSysFk},
+             #{item.updateTime},
-            #{item.updateTime},
+             #{item.createUser},
-            #{item.createUser},
+             #{item.createTime},
-            #{item.createTime},
+             #{item.updateUser},
-            #{item.updateUser},
+             #{item.remark})
-            #{item.remark}
-            )
         </foreach>
     </insert>
 
@@ -96,47 +89,73 @@
     <update id="updateThrCorps" parameterType="com.glxp.api.entity.thrsys.ThrCorpEntity">
         UPDATE thr_corp
         <trim prefix="set" suffixOverrides=",">
-            <if test="unitId != null">unitId=#{unitId},</if>
+            <if test="unitId != null">
-            <if test="name != null">name=#{name},</if>
+                unitId=#{unitId},
-            <if test="spell != null">spell=#{spell},</if>
+            </if>
-            <if test="addr != null">addr=#{addr},</if>
+            <if test="name != null">
-            <if test="creditNo != null">creditNo=#{creditNo},</if>
+                name=#{name},
-            <if test="contact != null">contact=#{contact},</if>
+            </if>
-            <if test="mobile != null">mobile=#{mobile},</if>
+            <if test="spell != null">
-            <if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
+                spell=#{spell},
-            <if test="updateTime != null">updateTime=#{updateTime},</if>
+            </if>
-            <if test="createUser != null">createUser=#{createUser},</if>
+            <if test="addr != null">
-            <if test="createTime != null">createTime=#{createTime},</if>
+                addr=#{addr},
-            <if test="updateUser != null">updateUser=#{updateUser},</if>
+            </if>
-            <if test="remark != null">remark=#{remark},</if>
+            <if test="creditNo != null">
-
+                creditNo=#{creditNo},
+            </if>
+            <if test="contact != null">
+                contact=#{contact},
+            </if>
+            <if test="mobile != null">
+                mobile=#{mobile},
+            </if>
+            <if test="thirdSysFk != null">
+                thirdSysFk=#{thirdSysFk},
+            </if>
+            <if test="updateTime != null">
+                updateTime=#{updateTime},
+            </if>
+            <if test="createUser != null">
+                createUser=#{createUser},
+            </if>
+            <if test="createTime != null">
+                createTime=#{createTime},
+            </if>
+            <if test="updateUser != null">
+                updateUser=#{updateUser},
+            </if>
+            <if test="remark != null">
+                remark=#{remark},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>
 
     <insert id="importThrCorp" parameterType="com.glxp.api.entity.thrsys.ThrCorpEntity">
         replace
-        into thr_corp (unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, name, updateTime,createUser,createTime,updateUser,remark)
+            into thr_corp (unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, name, updateTime, createUser,
-        values (
+                           createTime, updateUser, remark)
-        #{unitId},
+        values (#{unitId},
-        #{spell},
+                #{spell},
-        #{addr},
+                #{addr},
-        #{creditNo},
+                #{creditNo},
-        #{contact},
+                #{contact},
-        #{mobile},
+                #{mobile},
-        #{thirdSysFk},
+                #{thirdSysFk},
-        #{name},
+                #{name},
-        #{updateTime},
+                #{updateTime},
-        #{item.createUser},
+                #{createUser},
-        #{item.createTime},
+                #{createTime},
-        #{item.updateUser},
+                #{updateUser},
-        #{item.remark}
+                #{remark}
         )
     </insert>
 
     <select id="selectByThirdId" parameterType="com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest"
             resultType="com.glxp.api.res.thrsys.ThrUnitMaintainResponse">
-        select * FROM basic_corp
+        select *
+        FROM basic_corp
         <where>
             <if test="thirdId != '' and thirdId != null">
                 AND thirdId = #{thirdId}
@@ -171,4 +190,64 @@
           and basic_third_sys.enabled = 1
     </select>
 
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrSystemDetailEntity"
+            useGeneratedKeys="true">
+        insert into thr_corp
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            unitId,
+            spell,
+            addr,
+            creditNo,
+            contact,
+            mobile,
+            thirdSysFk,
+            `name`,
+            `createUser`,
+            createTime,
+            updateUser,
+            updateTime,
+            remark,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{unitId,jdbcType=VARCHAR},
+            #{spell,jdbcType=VARCHAR},
+            #{addr,jdbcType=VARCHAR},
+            #{creditNo,jdbcType=VARCHAR},
+            #{contact,jdbcType=VARCHAR},
+            #{mobile,jdbcType=VARCHAR},
+            #{thirdSysFk,jdbcType=VARCHAR},
+            #{name,jdbcType=VARCHAR},
+            #{createUser,jdbcType=VARCHAR},
+            #{createTime,jdbcType=TIMESTAMP},
+            #{updateUser,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=TIMESTAMP},
+            #{remark,jdbcType=VARCHAR},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            unitId       = #{unitId,jdbcType=VARCHAR},
+            spell        = #{spell,jdbcType=VARCHAR},
+            addr         = #{addr,jdbcType=VARCHAR},
+            creditNo     = #{creditNo,jdbcType=VARCHAR},
+            contact      = #{contact,jdbcType=VARCHAR},
+            mobile       = #{mobile,jdbcType=VARCHAR},
+            thirdSysFk   = #{thirdSysFk,jdbcType=VARCHAR},
+            `name`       = #{name,jdbcType=VARCHAR},
+            `createUser` = #{createUser,jdbcType=VARCHAR},
+            createTime   = #{createTime,jdbcType=TIMESTAMP},
+            updateUser   = #{updateUser,jdbcType=VARCHAR},
+            updateTime   = #{updateTime,jdbcType=TIMESTAMP},
+            remark       = #{remark,jdbcType=VARCHAR},
+        </trim>
+    </insert>
 </mapper>

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

@@ -210,32 +210,58 @@
         </foreach>
     </insert>
 
-    <update id="insertOrUpdate" parameterType="com.glxp.api.entity.thrsys.ThrDeptEntity">
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrDeptEntity"
-        <selectKey keyProperty="id" resultType="Integer" order="BEFORE">
+            useGeneratedKeys="true">
-            select id
+        insert into thr_dept
-            from thr_dept
+        <trim prefix="(" suffix=")" suffixOverrides=",">
-            where id = #{id}
+            <if test="id != null">
-        </selectKey>
+                id,
-        <if test="id != null">
+            </if>
-            update thr_dept
+            pId,
-            set pId         = #{pid},
+            code,
-                name        = #{name},
+            `name`,
-                code        = #{code},
+            advanceType,
-                advanceType = #{advanceType},
+            isDefault,
-                isDefault   = #{isDefault},
+            `status`,
-                status      = #{status},
+            updateTime,
-                updateTime  = #{updateTime},
+            remark,
-                remark      = #{remark},
+            `level`,
-                level       = #{level},
+            pcode,
-                pcode       = #{pcode},
+            thirdSysFk,
-                thirdSysFk  = #{thirdSysFk}
+        </trim>
-            where id = #{id};
+        values
-        </if>
+        <trim prefix="(" suffix=")" suffixOverrides=",">
-        <if test="id == null">
+            <if test="id != null">
-            insert into thr_dept(id, pId, code, name, advanceType, isDefault, status, updateTime, remark, level, pcode,
+                #{id,jdbcType=INTEGER},
-                                 thirdSysFk)
+            </if>
-            values (#{id}, #{pid}, #{code}, #{name}, #{advanceType}, #{isDefault}, #{status}, #{updateTime}, #{remark},
+            #{pId,jdbcType=INTEGER},
-                    #{level}, #{pcode}, #{thirdSysFk})
+            #{code,jdbcType=VARCHAR},
-        </if>
+            #{name,jdbcType=VARCHAR},
-    </update>
+            #{advanceType,jdbcType=VARCHAR},
+            #{isDefault,jdbcType=TINYINT},
+            #{status,jdbcType=TINYINT},
+            #{updateTime,jdbcType=TIMESTAMP},
+            #{remark,jdbcType=VARCHAR},
+            #{level,jdbcType=TINYINT},
+            #{pcode,jdbcType=VARCHAR},
+            #{thirdSysFk,jdbcType=VARCHAR},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            pId         = #{pId,jdbcType=INTEGER},
+            code        = #{code,jdbcType=VARCHAR},
+            `name`      = #{name,jdbcType=VARCHAR},
+            advanceType = #{advanceType,jdbcType=VARCHAR},
+            isDefault   = #{isDefault,jdbcType=TINYINT},
+            `status`    = #{status,jdbcType=TINYINT},
+            updateTime  = #{updateTime,jdbcType=TIMESTAMP},
+            remark      = #{remark,jdbcType=VARCHAR},
+            `level`     = #{level,jdbcType=TINYINT},
+            pcode       = #{pcode,jdbcType=VARCHAR},
+            thirdSysFk  = #{thirdSysFk,jdbcType=VARCHAR},
+        </trim>
+    </insert>
 </mapper>

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

@@ -122,12 +122,20 @@
         WHERE id = #{id}
     </update>
 
-    <update id="insertOrUpdate" parameterType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity">
+    <insert id="insertOrUpdate" parameterType="com.glxp.api.entity.thrsys.ThrInvWarehouseEntity">
-    <selectKey keyProperty="id" resultType="Integer" order="BEFORE">
+        insert into thr_inv_warehouse
-            select id
+        (id, code, `name`, parentId, remark, thirdSysFk,updateTime)
-            from thr_dept
+        values
-            where id = #{id}
+        (#{id,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR},
-        </selectKey>
+        #{remark,jdbcType=VARCHAR}, #{thirdSysFk,jdbcType=VARCHAR}, #{updateTime})
-    </update>
+        on duplicate key update
+        id = #{id,jdbcType=VARCHAR},
+        code = #{code,jdbcType=VARCHAR},
+        `name` = #{name,jdbcType=VARCHAR},
+        parentId = #{parentId,jdbcType=VARCHAR},
+        remark = #{remark,jdbcType=VARCHAR},
+        thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR},
+        updateTime = #{updateTime,jdbcType=DATE}
+    </insert>
 
 </mapper>

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

@@ -1,36 +1,37 @@
 <?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.glxp.api.dao.thrsys.ThrProductsDao">
-
-
     <select id="filterThrProducts" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
-        SELECT * FROM thr_products
+        SELECT *
+        FROM thr_products
         <where>
             <if test="name != '' and name != null">
-                AND name LIKE concat('%',#{name},'%')
+                AND name LIKE concat('%', #{name}, '%')
             </if>
             <if test="code != '' and code != null">
                 AND code = #{code}
             </if>
             <if test="sptm != '' and sptm != null">
-                AND sptm LIKE concat('%',#{sptm},'%')
+                AND sptm LIKE concat('%', #{sptm}, '%')
             </if>
             <if test="ybbm != '' and ybbm != null">
-                AND ybbm LIKE concat('%',#{ybbm},'%')
+                AND ybbm LIKE concat('%', #{ybbm}, '%')
             </if>
             <if test="registerNo != '' and registerNo != null">
-                AND registerNo LIKE concat('%',#{registerNo},'%')
+                AND registerNo LIKE concat('%', #{registerNo}, '%')
             </if>
             <if test="manufactory != '' and manufactory != null">
-                AND manufactory LIKE concat('%',#{manufactory},'%')
+                AND manufactory LIKE concat('%', #{manufactory}, '%')
             </if>
             <if test="spec != '' and spec != null">
-                AND spec LIKE concat('%',#{spec},'%')
+                AND spec LIKE concat('%', #{spec}, '%')
             </if>
             <if test="unionCode != '' and unionCode != null">
-                or code LIKE concat('%',#{unionCode},'%') or sptm LIKE concat('%',#{unionCode},'%') or ybbm LIKE
+                or code LIKE concat('%', #{unionCode}, '%')
-                concat('%',#{unionCode},'%')
+                or sptm LIKE concat('%', #{unionCode}, '%')
+                or ybbm LIKE
+                   concat('%', #{unionCode}, '%')
             </if>
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
@@ -39,16 +40,19 @@
                 AND thirdSysFk = #{thirdSys}
             </if>
             <if test="supName != '' and supName != null">
-                AND supName LIKE concat('%',#{supName},'%')
+                AND supName LIKE concat('%', #{supName}, '%')
             </if>
-            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+            <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')   ]]>
+                <![CDATA[
+                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
         </where>
     </select>
     <select id="filterThrProducts1" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
-        SELECT * FROM thr_products
+        SELECT *
+        FROM thr_products
         <where>
             <if test="name != '' and name != null">
                 AND name = #{name}
@@ -57,23 +61,25 @@
                 AND code = #{code}
             </if>
             <if test="sptm != '' and sptm != null">
-                AND sptm= #{sptm}
+                AND sptm = #{sptm}
             </if>
             <if test="ybbm != '' and ybbm != null">
                 AND ybbm = #{ybbm}
             </if>
             <if test="registerNo != '' and registerNo != null">
-                AND registerNo= #{registerNo}
+                AND registerNo = #{registerNo}
             </if>
             <if test="manufactory != '' and manufactory != null">
-                AND manufactory= #{manufactory}
+                AND manufactory = #{manufactory}
             </if>
             <if test="spec != '' and spec != null">
                 AND spec = #{spec}
             </if>
             <if test="unionCode != '' and unionCode != null">
-                or code LIKE = #{unionCode} or sptm = #{unionCode} or ybbm LIKE
+                or code LIKE = #{unionCode}
-                = #{unionCode}
+                or sptm = #{unionCode}
+                or ybbm LIKE
+                       = #{unionCode}
             </if>
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
@@ -84,8 +90,10 @@
             <if test="supName != '' and supName != null">
                 AND supName LIKE = #{supName}
             </if>
-            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+            <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')   ]]>
+                <![CDATA[
+                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
         </where>
     </select>
@@ -93,33 +101,36 @@
 
     <select id="filterJoinThrProducts" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.res.thrsys.ThrProductsResponse">
-        SELECT thr_products.*,thr_system.thirdName thirdSysName FROM thr_products
+        SELECT thr_products.*, thr_system.thirdName thirdSysName
-        LEFT JOIN thr_system on thr_products.thirdSysFk = thr_system.thirdId
+        FROM thr_products
+                 LEFT JOIN thr_system on thr_products.thirdSysFk = thr_system.thirdId
         <where>
             <if test="name != '' and name != null">
-                AND name LIKE concat('%',#{name},'%')
+                AND name LIKE concat('%', #{name}, '%')
             </if>
             <if test="code != '' and code != null">
-                AND code LIKE concat('%',#{code},'%')
+                AND code LIKE concat('%', #{code}, '%')
             </if>
             <if test="sptm != '' and sptm != null">
-                AND sptm LIKE concat('%',#{sptm},'%')
+                AND sptm LIKE concat('%', #{sptm}, '%')
             </if>
             <if test="ybbm != '' and ybbm != null">
-                AND ybbm LIKE concat('%',#{ybbm},'%')
+                AND ybbm LIKE concat('%', #{ybbm}, '%')
             </if>
             <if test="registerNo != '' and registerNo != null">
-                AND registerNo LIKE concat('%',#{registerNo},'%')
+                AND registerNo LIKE concat('%', #{registerNo}, '%')
             </if>
             <if test="manufactory != '' and manufactory != null">
-                AND manufactory LIKE concat('%',#{manufactory},'%')
+                AND manufactory LIKE concat('%', #{manufactory}, '%')
             </if>
             <if test="spec != '' and spec != null">
-                AND spec LIKE concat('%',#{spec},'%')
+                AND spec LIKE concat('%', #{spec}, '%')
             </if>
             <if test="unionCode != '' and unionCode != null">
-                or code LIKE concat('%',#{unionCode},'%') or sptm LIKE concat('%',#{unionCode},'%') or ybbm LIKE
+                or code LIKE concat('%', #{unionCode}, '%')
-                concat('%',#{unionCode},'%')
+                or sptm LIKE concat('%', #{unionCode}, '%')
+                or ybbm LIKE
+                   concat('%', #{unionCode}, '%')
             </if>
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
@@ -128,10 +139,12 @@
                 AND thirdSysFk = #{thirdSys}
             </if>
             <if test="supName != '' and supName != null">
-                AND supName LIKE concat('%',#{supName},'%')
+                AND supName LIKE concat('%', #{supName}, '%')
             </if>
-            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+            <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')   ]]>
+                <![CDATA[
+                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
         </where>
     </select>
@@ -153,60 +166,60 @@
     <insert id="insertThrProducts" keyProperty="id"
             parameterType="com.glxp.api.entity.thrsys.ThrProductsEntity">
         replace
-        INTO thr_products
+            INTO thr_products
-                (code, `name`, measname, spec, registerNo, manufactory,
+        (code, `name`, measname, spec, registerNo, manufactory,
-                 cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
+         cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
-                 thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,price,createUser,createTime,updateUser)
+         thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3, price,
-        values (
+         createUser, createTime, updateUser)
-        #{code},
+        values (#{code},
-        #{name},
+                #{name},
-        #{measname},
+                #{measname},
-        #{spec},
+                #{spec},
-        #{registerNo},
+                #{registerNo},
-        #{manufactory},
+                #{manufactory},
-        #{cplb},
+                #{cplb},
-        #{flbm},
+                #{flbm},
-        #{qxlb},
+                #{qxlb},
-        #{ybbm},
+                #{ybbm},
-        #{sptm},
+                #{sptm},
-        #{tyshxydm},
+                #{tyshxydm},
-        #{zczbhhzbapzbh},
+                #{zczbhhzbapzbh},
-        #{ylqxzcrbarmc},
+                #{ylqxzcrbarmc},
-        #{ylqxzcrbarywmc},
+                #{ylqxzcrbarywmc},
-        #{cpms},
+                #{cpms},
-        #{thirdSysFk},
+                #{thirdSysFk},
-        #{updateTime},
+                #{updateTime},
-        #{supName},
+                #{supName},
-        #{model},
+                #{model},
-        #{standard},
+                #{standard},
-        #{qtbm},
+                #{qtbm},
-        #{zczyxqz},
+                #{zczyxqz},
-        #{remark},
+                #{remark},
-        #{remark1},
+                #{remark1},
-        #{remark2},
+                #{remark2},
-        #{remark3},
+                #{remark3},
-        #{price},
+                #{price},
-        #{createUser},
+                #{createUser},
-        #{createTime},
+                #{createTime},
-        #{updateUser}
+                #{updateUser})
-        )
     </insert>
 
     <select id="selectThrProducts" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
-        SELECT * FROM thr_products
+        SELECT *
+        FROM thr_products
         <where>
             <if test="name != '' and name != null">
-                AND name =#{name}
+                AND name = #{name}
             </if>
             <if test="code != '' and code != null">
-                AND code =#{code}
+                AND code = #{code}
             </if>
             <if test="registerNo != '' and registerNo != null">
-                AND registerNo=#{registerNo}
+                AND registerNo = #{registerNo}
             </if>
             <if test="manufactory != '' and manufactory != null">
-                AND manufactory=#{manufactory}
+                AND manufactory = #{manufactory}
             </if>
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
@@ -215,4 +228,119 @@
         ORDER BY updateTime DESC
     </select>
 
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
+            parameterType="com.glxp.api.entity.thrsys.ThrProductsEntity" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into thr_products
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            code,
+            `name`,
+            measname,
+            spec,
+            registerNo,
+            manufactory,
+            thirdSysFk,
+            cplb,
+            flbm,
+            qxlb,
+            ybbm,
+            sptm,
+            tyshxydm,
+            zczbhhzbapzbh,
+            ylqxzcrbarmc,
+            ylqxzcrbarywmc,
+            cpms,
+            updateTime,
+            supName,
+            model,
+            `standard`,
+            qtbm,
+            zczyxqz,
+            remark,
+            remark1,
+            remark2,
+            remark3,
+            price,
+            `createUser`,
+            createTime,
+            updateUser,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{code,jdbcType=VARCHAR},
+            #{name,jdbcType=VARCHAR},
+            #{measname,jdbcType=VARCHAR},
+            #{spec,jdbcType=VARCHAR},
+            #{registerNo,jdbcType=VARCHAR},
+            #{manufactory,jdbcType=VARCHAR},
+            #{thirdSysFk,jdbcType=VARCHAR},
+            #{cplb,jdbcType=VARCHAR},
+            #{flbm,jdbcType=VARCHAR},
+            #{qxlb,jdbcType=VARCHAR},
+            #{ybbm,jdbcType=VARCHAR},
+            #{sptm,jdbcType=VARCHAR},
+            #{tyshxydm,jdbcType=VARCHAR},
+            #{zczbhhzbapzbh,jdbcType=VARCHAR},
+            #{ylqxzcrbarmc,jdbcType=VARCHAR},
+            #{ylqxzcrbarywmc,jdbcType=VARCHAR},
+            #{cpms,jdbcType=LONGVARCHAR},
+            #{updateTime,jdbcType=TIMESTAMP},
+            #{supName,jdbcType=VARCHAR},
+            #{model,jdbcType=VARCHAR},
+            #{standard,jdbcType=VARCHAR},
+            #{qtbm,jdbcType=VARCHAR},
+            #{zczyxqz,jdbcType=VARCHAR},
+            #{remark,jdbcType=VARCHAR},
+            #{remark1,jdbcType=VARCHAR},
+            #{remark2,jdbcType=VARCHAR},
+            #{remark3,jdbcType=VARCHAR},
+            #{price,jdbcType=VARCHAR},
+            #{createUser,jdbcType=VARCHAR},
+            #{createTime,jdbcType=TIMESTAMP},
+            #{updateUser,jdbcType=VARCHAR},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            code           = #{code,jdbcType=VARCHAR},
+            `name`         = #{name,jdbcType=VARCHAR},
+            measname       = #{measname,jdbcType=VARCHAR},
+            spec           = #{spec,jdbcType=VARCHAR},
+            registerNo     = #{registerNo,jdbcType=VARCHAR},
+            manufactory    = #{manufactory,jdbcType=VARCHAR},
+            thirdSysFk     = #{thirdSysFk,jdbcType=VARCHAR},
+            cplb           = #{cplb,jdbcType=VARCHAR},
+            flbm           = #{flbm,jdbcType=VARCHAR},
+            qxlb           = #{qxlb,jdbcType=VARCHAR},
+            ybbm           = #{ybbm,jdbcType=VARCHAR},
+            sptm           = #{sptm,jdbcType=VARCHAR},
+            tyshxydm       = #{tyshxydm,jdbcType=VARCHAR},
+            zczbhhzbapzbh  = #{zczbhhzbapzbh,jdbcType=VARCHAR},
+            ylqxzcrbarmc   = #{ylqxzcrbarmc,jdbcType=VARCHAR},
+            ylqxzcrbarywmc = #{ylqxzcrbarywmc,jdbcType=VARCHAR},
+            cpms           = #{cpms,jdbcType=LONGVARCHAR},
+            updateTime     = #{updateTime,jdbcType=TIMESTAMP},
+            supName        = #{supName,jdbcType=VARCHAR},
+            model          = #{model,jdbcType=VARCHAR},
+            `standard`     = #{standard,jdbcType=VARCHAR},
+            qtbm           = #{qtbm,jdbcType=VARCHAR},
+            zczyxqz        = #{zczyxqz,jdbcType=VARCHAR},
+            remark         = #{remark,jdbcType=VARCHAR},
+            remark1        = #{remark1,jdbcType=VARCHAR},
+            remark2        = #{remark2,jdbcType=VARCHAR},
+            remark3        = #{remark3,jdbcType=VARCHAR},
+            price          = #{price,jdbcType=VARCHAR},
+            `createUser`   = #{createUser,jdbcType=VARCHAR},
+            createTime     = #{createTime,jdbcType=TIMESTAMP},
+            updateUser     = #{updateUser,jdbcType=VARCHAR},
+        </trim>
+    </insert>
 </mapper>

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

@@ -170,6 +170,13 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'systemConfig', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'printConfig', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'scanChangeConfig', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'busChangeConfig', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_set', 'basicThirdDept', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_param_config', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_code', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1);
+CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1);
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'advancePreIn', 'tinyint', 1);