feat: controller 代码优化

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -70,30 +70,25 @@ public class BasicCorpController extends BaseController {
     @GetMapping("/udiwms/basic/unit/maintain/filter")
     public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
                                                 BindingResult bindingResult) {
-
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<BasicCorpEntity> basicUnitMaintainEntities;
         basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
-        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
+        List<BasicCorpEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicUnitMaintainEntities);
-
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
     @GetMapping("/udiwms/basic/unit/maintain/filterOptimize")
     public BaseResponse filterBasicUnitMaintainOptimize(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
                                                         BindingResult bindingResult) {
-
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<BasicCorpEntity> basicUnitMaintainEntities;
+        List<BasicCorpEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
-        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
         List<DictDto> reList = basicUnitMaintainEntities.stream().map(s-> {
@@ -103,21 +98,17 @@ public class BasicCorpController extends BaseController {
 
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(reList);
-
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
     @GetMapping("/udiwms/basic/unit/maintain/filter2")
     public BaseResponse filterBasicUnitMaintain2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
                                                  BindingResult bindingResult) {
-
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<BasicCorpEntity> basicUnitMaintainEntities;
+        List<BasicCorpEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
-        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
+        PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
-        PageInfo<BasicCorpEntity> pageInfo;
-        pageInfo = new PageInfo<>(basicUnitMaintainEntities);
         PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicUnitMaintainEntities);
@@ -149,7 +140,6 @@ public class BasicCorpController extends BaseController {
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
-
         return ResultVOUtils.success();
     }
 
@@ -165,7 +155,6 @@ public class BasicCorpController extends BaseController {
         if (result) {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
         }
-
         basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest);
         return ResultVOUtils.success("修改成功");
     }
@@ -189,8 +178,7 @@ public class BasicCorpController extends BaseController {
             basicUnitMaintainResponse.setUnitId(item.getErpId());
             return basicUnitMaintainResponse;
         }).collect(Collectors.toList());
-        PageInfo<BasicUnitMaintainResponse> pageInfo;
+        PageInfo<BasicUnitMaintainResponse> pageInfo = new PageInfo<>(basicUnitMaintainResponses);
-        pageInfo = new PageInfo<>(basicUnitMaintainResponses);
         PageSimpleResponse<BasicUnitMaintainResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicUnitMaintainResponses);
@@ -206,8 +194,7 @@ public class BasicCorpController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
-        List<BasicCorpEntity> basicUnitMaintainEntities;
+        List<BasicCorpEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
-        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
 
         List<BasicUnitMaintainResponse> basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item ->
         {
@@ -216,8 +203,7 @@ public class BasicCorpController extends BaseController {
             basicUnitMaintainResponse.setUnitId(item.getErpId());
             return basicUnitMaintainResponse;
         }).collect(Collectors.toList());
-        PageInfo<BasicUnitMaintainResponse> pageInfo;
+        PageInfo<BasicUnitMaintainResponse> pageInfo = new PageInfo<>(basicUnitMaintainResponses);
-        pageInfo = new PageInfo<>(basicUnitMaintainResponses);
         PageSimpleResponse<BasicUnitMaintainResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicUnitMaintainResponses);
@@ -282,12 +268,10 @@ public class BasicCorpController extends BaseController {
             return ResultVOUtils.error(500, "往来单位接口地址未定义");
         if (basicThirdSysDetailEntity.getEnabled()) {
             thrUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest);
-
         } else {
             return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用");
         }
 
-
         return ResultVOUtils.success("后台正在添加，请稍后刷新查看！");
     }
 

src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java

@@ -17,6 +17,8 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicCorpExportLogResponse;
 import com.glxp.api.service.basic.BasicCorpExportLogService;
 import com.glxp.api.service.basic.BasicCorpService;
+import com.glxp.api.service.basic.BasicGenExcelService;
+import com.glxp.api.service.basic.BasicGenJsonService;
 import com.glxp.api.util.CustomUtil;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,7 +44,6 @@ public class BasicCorpExportLogController {
     private BasicCorpService basicUnitMaintainService;
     @Resource
     private BasicGenJsonService basicGenJsonService;
-    ;
 
     @GetMapping("/udiwms/corps/exportLog/filter")
     public BaseResponse filter(FilterCorpExportLogRequest filterCorpExportLogRequest,
@@ -53,8 +54,7 @@ public class BasicCorpExportLogController {
         }
         List<BasicCorpsExportLogEntity> corpExportLogEntities
                 = basicCorpExportLogService.filterCorpExportLog(filterCorpExportLogRequest);
-        PageInfo<BasicCorpsExportLogEntity> pageInfo;
+        PageInfo<BasicCorpsExportLogEntity> pageInfo = new PageInfo<>(corpExportLogEntities);
-        pageInfo = new PageInfo<>(corpExportLogEntities);
         PageSimpleResponse<BasicCorpsExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(corpExportLogEntities);
@@ -127,7 +127,6 @@ public class BasicCorpExportLogController {
         //basicGenExcelService.exportCorp(genKey, corpsExportRequest);
         basicGenJsonService.exportCorp(genKey, basicCorpsExportRequest);
 
-
         return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!");
     }
 

src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java

@@ -49,8 +49,7 @@ public class BasicCorpImportLogController {
         }
         List<BasicCorpsImportLogEntity> udiInfoImportLogEntities
                 = basicCorpImportLogService.filterImportLog(filterCorpImportLogRequest);
-        PageInfo<BasicCorpsImportLogEntity> pageInfo;
+        PageInfo<BasicCorpsImportLogEntity> pageInfo = new PageInfo<>(udiInfoImportLogEntities);
-        pageInfo = new PageInfo<>(udiInfoImportLogEntities);
         PageSimpleResponse<BasicCorpsImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoImportLogEntities);
@@ -105,8 +104,6 @@ public class BasicCorpImportLogController {
                     corpImportLogEntity.setFromType("文件导入");
                     corpImportLogEntity.setUpdateTime(new Date());
                     corpImportLogEntity.setCreateTime(new Date());
-//                    corpImportLogEntity.setCreateUser(String.valueOf(customerService.getUserId()));
-//                    corpImportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId()));
                     corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
                     corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
                     basicCorpImportLogService.insertImportLog(corpImportLogEntity);

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -58,7 +58,6 @@ public class BasicOrderPrintController {
     SystemPDFTemplateService systemPDFTemplateService;
     @Resource
     IoOrderDetailBizService ioOrderDetailBizService;
-
     @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
@@ -73,7 +72,6 @@ public class BasicOrderPrintController {
     SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService;
     @Value("${file_path}")
     private String filePath;
-
     @Resource
     SystemParamConfigService systemParamConfigService;
     @Resource
@@ -86,7 +84,6 @@ public class BasicOrderPrintController {
     @PostMapping("/udiwms/pdf/template/inspection/order/file")
     public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) {
 
-
         String name = getStatusName(filterOrderPrintRequest.getStatus());
         SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction());
         if (sysPdfTemplateRelevanceCodeEntity != null) {
@@ -166,7 +163,6 @@ public class BasicOrderPrintController {
                     bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
 
-
                     if (IntUtil.value(printThird) == 1) {
                         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(obj.getBindRlFk());
                         ThrProductsEntity thrProductsEntity = thrProductsService.selectByCode(udiRelevanceEntity.getThirdId());
@@ -175,11 +171,9 @@ public class BasicOrderPrintController {
                         bizData.put("spec", thrProductsEntity.getSpec() == null ? ' ' : thrProductsEntity.getSpec());
                         bizData.put("measname", thrProductsEntity.getMeasname() == null ? ' ' : thrProductsEntity.getMeasname());
                         bizData.put("manufactor", thrProductsEntity.getManufactory());
-//                        bizData.put("zczbhhzbapzbh", thrProductsEntity.getRegisterNo() == null ? ' ' : thrProductsEntity.getRegisterNo());
                         bizData.put("ylqxzcrbarmc", thrProductsEntity.getYlqxzcrbarmc() == null ? ' ' : thrProductsEntity.getYlqxzcrbarmc());
                     }
 
-
                     //添加发票号
                     String fphm = "";
                     String fprq = null;
@@ -198,8 +192,6 @@ public class BasicOrderPrintController {
                     i++;
                 }
             }
-
-
         } else {
             //查询单据表
             FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
@@ -225,11 +217,7 @@ public class BasicOrderPrintController {
                             break;
                         }
                     }
-                    //查询产品表
-//                    UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk());
-
                     UdiRelevanceResponse udiProductEntity = udiRelevanceService.selectByRelId(obj.getRelId() + "");
-//                    List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
                     //组装数据
                     Map<String, Object> bizData = new HashMap<>();
                     bizData.put("index", i);
@@ -289,7 +277,6 @@ public class BasicOrderPrintController {
             }
         }
 
-
         data.put("data", list);
         String param = JSON.toJSONString(data);
         JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf");
@@ -336,7 +323,6 @@ public class BasicOrderPrintController {
             @RequestBody FilterOrderPrintRequest filterOrderPrintRequest,
             HttpServletRequest request, HttpServletResponse response) throws Exception {
 
-
         List<Object> list = new ArrayList<>();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式
         SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(filterOrderPrintRequest.getLabelId() + "");
@@ -350,7 +336,6 @@ public class BasicOrderPrintController {
         //查询单据表
         FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
         filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk());
-        IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0);
         //查询业务单详情
         List<IoCodeEntity> ioCodeEntityList = ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk());
         int i = 1;

src/main/java/com/glxp/api/controller/basic/BasicProductSetController.java

@@ -29,8 +29,7 @@ public class BasicProductSetController {
     @GetMapping("/spms/basicProduct/setup/filter")
     public BaseResponse filterSetUps(FilterBasicProductSetrequest filterBasicProductSetrequest) {
         List<BasicProductSetEntity> basicProductSetEntities = basicProductSetService.filterSetup(filterBasicProductSetrequest);
-        PageInfo<BasicProductSetEntity> pageInfo;
+        PageInfo<BasicProductSetEntity> pageInfo = new PageInfo<>(basicProductSetEntities);
-        pageInfo = new PageInfo<>(basicProductSetEntities);
         PageSimpleResponse<BasicProductSetEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicProductSetEntities);

src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java

@@ -17,11 +17,12 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.res.basic.UdiRlDlResponse;
+import com.glxp.api.service.basic.BasicGenExcelService;
+import com.glxp.api.service.basic.BasicGenJsonService;
 import com.glxp.api.service.basic.BasicProductsExportLogService;
 import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.util.CustomUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -155,7 +156,6 @@ public class BasicProductsExportLogController {
         basicProductsExportLogService.insertUdiInfoExportLog(basicProductsExportLogEntity);
         UdiRelevanceExportJsonResponse exportData = basicGenJsonService.paresDataJson(udiInfoExportRequest);
         basicGenExcelService.uploadProductsSmpJson(genKey, exportData);
-//        basicGenExcelService.uploadProductsSmp(genKey, udiInfoExportRequest);
         return ResultVOUtils.success("后台正在上传，请稍后刷新查看!");
 
     }
@@ -192,8 +192,7 @@ public class BasicProductsExportLogController {
             BeanUtil.copyProperties(item, udiRlDlResponse);
             return udiRlDlResponse;
         }).collect(Collectors.toList());
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRlDlResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRlDlResponses);
@@ -231,8 +230,7 @@ public class BasicProductsExportLogController {
             BeanUtil.copyProperties(item, udiRlDlResponse);
             return udiRlDlResponse;
         }).collect(Collectors.toList());
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRlDlResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRlDlResponses);

src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java

@@ -45,8 +45,6 @@ public class BasicProductsImportLogController {
     @Resource
     BasicProductsImportDetailService basicProductsImportDetailService;
 
-
-    private static final String TAG = "UdiInfoImportLogControl";
     private static final Logger log = LoggerFactory.getLogger(BasicProductsImportLogController.class);
 
     @GetMapping("/udiwms/products/importLog/filter")
@@ -58,8 +56,7 @@ public class BasicProductsImportLogController {
         }
         List<BasicProductsImportLogEntity> udiInfoImportLogEntities
                 = basicProductsImportLogService.filterImportLog(filterUdiIpLogRequest);
-        PageInfo<BasicProductsImportLogEntity> pageInfo;
+        PageInfo<BasicProductsImportLogEntity> pageInfo = new PageInfo<>(udiInfoImportLogEntities);
-        pageInfo = new PageInfo<>(udiInfoImportLogEntities);
         PageSimpleResponse<BasicProductsImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoImportLogEntities);
@@ -256,7 +253,6 @@ public class BasicProductsImportLogController {
         basicProductsImportLogService.insertImportLog(basicProductsImportLogEntity);
         basicProductsImportLogService.downloadSmpUdiInfo(genKey, filterUdiIpLogRequest.getLastUpdateTime());
         return ResultVOUtils.success("后台已开始下载并更新，请稍后刷新查看!");
-
     }
 
 }

src/main/java/com/glxp/api/controller/basic/UdiContrastController.java

@@ -64,7 +64,7 @@ public class UdiContrastController extends BaseController{
     @Resource
     UdiProductService udiProductService;
     @Resource
-    private ThrSystemService thrSystemService;
+    ThrSystemService thrSystemService;
     @Resource
     UdiContrastService udiContrastService;
     @Resource
@@ -76,10 +76,9 @@ public class UdiContrastController extends BaseController{
     @Resource
     CompanyService companyService;
     @Resource
-    private CompanyProductRelevanceService companyProductRelevanceService;
+    CompanyProductRelevanceService companyProductRelevanceService;
     @Resource
     IoOrderDetailCodeService orderDetailCodeService;
-
     @Resource
     SpsSyncWebSocket webSocketServer;
     @Resource
@@ -348,7 +347,6 @@ public class UdiContrastController extends BaseController{
                     productInfoEntityList.addAll(result);
                 }
             }
-
         }
 
         PageInfo<ProductInfoEntity> pageInfo;
@@ -357,7 +355,6 @@ public class UdiContrastController extends BaseController{
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(productInfoEntityList);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -386,7 +383,6 @@ public class UdiContrastController extends BaseController{
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/updateLevelDrugAli")
     public BaseResponse updateLevelDrugAli(@RequestBody ThirdAliDrugRequest thirdAliDrug) {
-     ;
         return   udiProductService.saveOrUpadateLevelDrugAli(thirdAliDrug);
     }
 
@@ -555,13 +551,10 @@ public class UdiContrastController extends BaseController{
     public void insertUdiInfos(List<UdiProductEntity> udiInfoEntities) {
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
             UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid());
-
             if (udiProductEntity == null) {
                 udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
             }
         }
     }
 
-
-
 }

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -66,9 +66,9 @@ public class UdiRelevanceController extends BaseController {
     @Resource
     BasicUpdateProductService basicUpdateProductService;
     @Resource
-    private SystemParamConfigService systemParamConfigService;
+    SystemParamConfigService systemParamConfigService;
     @Resource
-    private ThrSystemService thrSystemService;
+    ThrSystemService thrSystemService;
     @Resource
     ThrDataService thrDataService;
     @Resource
@@ -92,8 +92,7 @@ public class UdiRelevanceController extends BaseController {
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
         udiRelevanceResponses = udiRelevanceDao.pdaDlUdiRel(filterUdiRelRequest);
 
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -108,7 +107,6 @@ public class UdiRelevanceController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        List<UdiRelevanceResponse> udiRelevanceResponses = null;
 
         if (StrUtil.isNotEmpty(filterUdiRelRequest.getBindRlIds())) {
             String[] datas = filterUdiRelRequest.getBindRlIds().split(",");
@@ -117,9 +115,8 @@ public class UdiRelevanceController extends BaseController {
             filterUdiRelRequest.setRelIds(list);
         }
 
-        udiRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
+        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -210,8 +207,7 @@ public class UdiRelevanceController extends BaseController {
             }
         }
 
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -224,8 +220,7 @@ public class UdiRelevanceController extends BaseController {
     @GetMapping("/udi/cert/filterUdi")
     public BaseResponse filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) {
         List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest);
-        PageInfo<UdiRelevanceResponse> pageInfo;
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
-        pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiRelevanceResponses);
@@ -245,10 +240,7 @@ public class UdiRelevanceController extends BaseController {
         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(filterUdiRelRequest.getId());
         FilterUdiRelRequest tempRequest = new FilterUdiRelRequest();
         tempRequest.setUuid(udiRelevanceEntity.getUuid());
-//        if (filterUdiRelRequest.getProductsType() == 2) {
-//        tempRequest.setNameCode(filterUdiRelRequest.getNameCode());
         tempRequest.setUuid(udiRelevanceEntity.getUuid());
-//        }
         List<UdiProductEntity> udiInfoEntities = udiProductService.filterAllUdiInfo(tempRequest);
 
         //移除层级为空的数据
@@ -274,7 +266,6 @@ public class UdiRelevanceController extends BaseController {
             }
         }
         return ResultVOUtils.success(udiRelevanceResponses);
-
     }
 
     //多选删除
@@ -494,8 +485,6 @@ public class UdiRelevanceController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/disable")
     public BaseResponse disable(@RequestBody UdiCombineRequest udiCombineRequest) {
-
-
         if (invProductService.isExitByRelId(udiCombineRequest.getRelId() + "")) {
             return ResultVOUtils.error(500, "库存已存在，无法禁用");
         }
@@ -506,21 +495,6 @@ public class UdiRelevanceController extends BaseController {
         return ResultVOUtils.success("更新成功");
     }
 
-
-    public UdiProductEntity getUdiInfo(UdiCombineRequest udiCombineRequest) {
-        UdiRelevanceEntity temp = udiRelevanceService.selectById(udiCombineRequest.getRelId());
-        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-        filterUdiRelRequest.setNameCode(udiCombineRequest.getThirdId());
-        filterUdiRelRequest.setUuid(temp.getUuid());
-        List<UdiProductEntity> udiInfoEntities = udiProductService.filterUdiInfo(filterUdiRelRequest);
-        if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
-            UdiProductEntity udiProductEntity = udiInfoEntities.get(0);
-            return udiProductEntity;
-        }
-        return null;
-    }
-
-
     //单独选入ERP产品
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/addErp")
@@ -578,8 +552,7 @@ public class UdiRelevanceController extends BaseController {
             }
         }
         filterSysEntityList.add(new FilterSysEntity(10, "最新同步"));
-        PageInfo<FilterSysEntity> pageInfo;
+        PageInfo<FilterSysEntity> pageInfo = new PageInfo<>(filterSysEntityList);
-        pageInfo = new PageInfo<>(filterSysEntityList);
         PageSimpleResponse<FilterSysEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(filterSysEntityList);
@@ -609,8 +582,7 @@ public class UdiRelevanceController extends BaseController {
             }
         }
         filterSysEntityList.add(new DictDto(10, "最新同步"));
-        PageInfo<DictDto> pageInfo;
+        PageInfo<DictDto> pageInfo = new PageInfo<>(filterSysEntityList);
-        pageInfo = new PageInfo<>(filterSysEntityList);
         PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(filterSysEntityList);
@@ -734,8 +706,7 @@ public class UdiRelevanceController extends BaseController {
                 }
             }
         }
-        PageInfo<BasicProductThirdSysResponse> pageInfo;
+        PageInfo<BasicProductThirdSysResponse> pageInfo = new PageInfo<>(basicProductThirdSysResponses);
-        pageInfo = new PageInfo<>(basicProductThirdSysResponses);
         PageSimpleResponse<BasicProductThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicProductThirdSysResponses);

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -64,7 +64,6 @@ public class UdiRlSupController extends BaseController {
     private CompanyProductsRelService companyProductsRelService;
     @Resource
     private BasicCorpService basicUnitMaintainService;
-
     @Resource
     private UdiRelevanceService udiRelevanceService;
     @Resource
@@ -148,8 +147,7 @@ public class UdiRlSupController extends BaseController {
         }
         List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
         basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
-        PageInfo<UdiRlSupResponse> pageInfo;
+        PageInfo<UdiRlSupResponse> pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
-        pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
         PageSimpleResponse<UdiRlSupResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
@@ -201,8 +199,7 @@ public class UdiRlSupController extends BaseController {
         }
         List<UdiRlSupEntity> companyProductRelevanceEntities =
                 udiRlSupService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
-        PageInfo<UdiRlSupEntity> pageInfo;
+        PageInfo<UdiRlSupEntity> pageInfo = new PageInfo<>(companyProductRelevanceEntities);
-        pageInfo = new PageInfo<>(companyProductRelevanceEntities);
         PageSimpleResponse<UdiRlSupEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(companyProductRelevanceEntities);
@@ -304,7 +301,6 @@ public class UdiRlSupController extends BaseController {
             udiProductService.insertUdiInfo(udiProductEntity);
         }
 
-
         try {
             CodeRel codeRel = new CodeRel();
             if (udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1) {
@@ -365,7 +361,6 @@ public class UdiRlSupController extends BaseController {
         BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity);
         //处理是否需要扫码字段
         classifyCodeService.updateRequireScanCode(udiProductEntity);
-       
 
         udiProductEntity.setUpdateTime(new Date());
         UdiRelevanceEntity udiRelevanceEntity1 = udiRelevanceService.selectById(Long.valueOf(rlidStr));
@@ -374,14 +369,13 @@ public class UdiRlSupController extends BaseController {
             byUuid.setCatalogname1(udiProductEntity.getCatalogname1());
             byUuid.setCatalogname2(udiProductEntity.getCatalogname2());
             byUuid.setCatalogname3(udiProductEntity.getCatalogname3());
-//            byUuid.setDetailSort(udiProductEntity.getDetailSort());
             byUuid.setYbbm(udiProductEntity.getYbbm());
             byUuid.setManufactory(udiProductEntity.getManufactory());
             byUuid.setUpdateTime(new Date());
             udiProductService.updateUdiInfo(byUuid);
         } else {
-
+            byUuid.setPrice(udiInfoExportRequest.getPrice());
-            byUuid.setPrice(udiInfoExportRequest.getPrice());        udiProductEntity.setId(IdUtil.getSnowflakeNextId());
+            udiProductEntity.setId(IdUtil.getSnowflakeNextId());
             udiProductService.insertUdiInfo(udiProductEntity);
         }
 

src/main/java/com/glxp/api/controller/basic/UdiSyncController.java

@@ -170,7 +170,6 @@ public class UdiSyncController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/udiinfo/filterCompany")
     public BaseResponse filterCompany(UdiCompanyRequest udiCompanyRequest) {
-
         try {
             BaseResponse<PageSimpleResponse<UdiCompanyEntity>> udiDlDeviceResponse = syncUdiService.filterCompany(udiCompanyRequest);
             return udiDlDeviceResponse;
@@ -312,8 +311,7 @@ public class UdiSyncController extends BaseController {
     public BaseResponse filterProduct(FilterUdiRelRequest filterUdiRelRequest) {
         List<UdiProductEntity> udiInfoEntities
                 = udiProductService.filterAllUdiInfo(filterUdiRelRequest);
-        PageInfo<UdiProductEntity> pageInfo;
+        PageInfo<UdiProductEntity> pageInfo = new PageInfo<>(udiInfoEntities);
-        pageInfo = new PageInfo<>(udiInfoEntities);
         PageSimpleResponse<UdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoEntities);
@@ -323,10 +321,8 @@ public class UdiSyncController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/basic/findByCode")
     public BaseResponse findByCode(FilterUdiRelRequest filterUdiRelRequest) {
-
         UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
-        UdiProductEntity udiProductEntity
+        UdiProductEntity udiProductEntity = udiProductService.findByNameCode(udiEntity.getUdi());
-                = udiProductService.findByNameCode(udiEntity.getUdi());
         return ResultVOUtils.success(udiProductEntity);
     }
 
@@ -334,7 +330,6 @@ public class UdiSyncController extends BaseController {
     //出入库同步下载
     @GetMapping("udidl/udiwms/syncUdi")
     public BaseResponse syncUdi(ProductInfoFilterRequest productInfoFilterRequest) {
-
         List<ProductInfoEntity> productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest);
         return ResultVOUtils.success(productInfoEntityList);
 
@@ -344,7 +339,6 @@ public class UdiSyncController extends BaseController {
     //出入库同步下载
     @GetMapping("udidl/udiwms/syncCompany")
     public BaseResponse syncCompany(UdiCompanyRequest udiCompanyRequest) {
-
         List<UdiCompanyEntity> udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest);
         return ResultVOUtils.success(udiCompanyEntities);
 

src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java

@@ -82,8 +82,7 @@ public class RelCodeBatchController extends BaseController {
     @GetMapping("/udiwms/relCode/batch/filter")
     public BaseResponse list(RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) {
         String customerId = getCustomerId();
-        if (!customerId.equals("110"))
+        if (!customerId.equals("110")) relCodeBatchRequest.setErpId(customerId);
-            relCodeBatchRequest.setErpId(customerId);
         List<RelCodeBatchResponse> relCodeBatchResponses = relCodeBatchService.filterList(relCodeBatchRequest);
         PageInfo<RelCodeBatchResponse> pageInfo = new PageInfo<>(relCodeBatchResponses);
         PageSimpleResponse<RelCodeBatchResponse> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/controller/collect/RelCodeDetailController.java

@@ -29,8 +29,6 @@ public class RelCodeDetailController extends BaseController {
     @Resource
     private RelCodeDetailService relCodeDetailService;
 
-
-
     /**
      * 扫码
      * @param relCodeDetailRequest

src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java

@@ -77,6 +77,4 @@ public class DeviceCheckDetailController extends BaseController {
         return ResultVOUtils.successMsg("操作成功");
     }
 
-
-
 }

src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailItemController.java

@@ -63,5 +63,4 @@ public class DeviceCheckDetailItemController extends BaseController {
         return ResultVOUtils.successMsg("操作成功");
     }
 
-
 }

src/main/java/com/glxp/api/controller/dev/DeviceCheckItemDictController.java

@@ -26,7 +26,6 @@ public class DeviceCheckItemDictController extends BaseController {
 
     private final DeviceCheckItemDictService deviceCheckItemDictService;
 
-
     /**
      * 生成一个项目编码
      *

src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java

@@ -63,7 +63,6 @@ public class DeviceInfoController extends BaseController {
     private final DeviceInfoService deviceInfoService;
     private final DeviceChangeLogService deviceChangeLogService;
 
-
     @Value("${file_path}")
     private String filePath;
 

src/main/java/com/glxp/api/controller/dev/DevicePlanDetailController.java

@@ -83,8 +83,6 @@ public class DevicePlanDetailController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udi/device/plan/detail/add")
     public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) {
-
-
         DevicePlanEntity entity = null;
         if (!param.valid(devicePlanService)) {
             AuthAdmin user = super.getUser();
@@ -129,5 +127,4 @@ public class DevicePlanDetailController extends BaseController {
         return ResultVOUtils.successMsg("删除成功");
     }
 
-
 }

src/main/java/com/glxp/api/controller/dev/DevicePlanDetailItemController.java

@@ -126,7 +126,6 @@ public class DevicePlanDetailItemController extends BaseController {
                     devicePlanDetailItemService.insertIgnoreBatch(entityList);
                 }
             }
-
         }
         return ResultVOUtils.successMsg("添加成功");
     }

src/main/java/com/glxp/api/controller/dev/DeviceUpkeepDetailController.java

@@ -30,11 +30,8 @@ import java.util.List;
 @RequestMapping
 public class DeviceUpkeepDetailController extends BaseController {
 
-
     private final DeviceUpkeepDetailService deviceUpkeepDetailService;
-
     private final DevicePlanService devicePlanService;
-
     private final DeviceInfoService deviceInfoService;
     private final DevicePlanDetailService devicePlanDetailService;
     private final DeviceUpkeepDetailItemService deviceUpkeepDetailItemService;
@@ -65,8 +62,6 @@ public class DeviceUpkeepDetailController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udi/device/upkeep/detail/add")
     public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) {
-
-
         DevicePlanEntity entity = null;
         if (!param.valid(devicePlanService)) {
             AuthAdmin user = super.getUser();
@@ -97,6 +92,4 @@ public class DeviceUpkeepDetailController extends BaseController {
         return ResultVOUtils.successMsg("操作成功");
     }
 
-
-
 }

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

@@ -70,7 +70,6 @@ public class IoCodeController extends BaseController {
         return ResultVOUtils.page(pageInfo);
     }
 
-
     /**
      * 根据单据号查询正式码表数据
      *
@@ -90,11 +89,8 @@ public class IoCodeController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("spms/inout/dlcode/findByOrderId")
     public BaseResponse downloadCodesByOrderId(String orderId) {
-
-
         List<IoCodeEntity> codeEntityList = ioCodeService.findByOrderId(orderId);
-        PageInfo<IoCodeEntity> pageInfo;
+        PageInfo<IoCodeEntity> pageInfo = new PageInfo<>(codeEntityList);
-        pageInfo = new PageInfo<>(codeEntityList);
         PageSimpleResponse<IoCodeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(codeEntityList);

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

@@ -41,8 +41,7 @@ public class IoCodeLostController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<IoCodeLostResponse> list = codeLostService.selectLost(ioCodeLostEntity);
-        PageInfo<IoCodeLostResponse> pageInfo;
+        PageInfo<IoCodeLostResponse> pageInfo = new PageInfo<>(list);
-        pageInfo = new PageInfo<>(list);
         PageSimpleResponse<IoCodeLostResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);
@@ -56,10 +55,7 @@ public class IoCodeLostController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
-
         codeLostService.update(ioCodeLostEntity);
-
         return ResultVOUtils.success("成功");
     }
 
@@ -120,6 +116,5 @@ public class IoCodeLostController extends BaseController {
         if (codeLostEntity == null)
             return ResultVOUtils.error(500, "未缓存！");
         return ResultVOUtils.success(codeLostEntity);
-
     }
 }

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

@@ -142,18 +142,15 @@ public class IoCodeTempController extends BaseController {
             inPostOrder.setPostOrders(inPostOrders);
             outPostOrder.setPostOrders(outPostOrders);
 
-
             if (CollUtil.isNotEmpty(inPostOrders)) {
                 inPostOrder.setCustomerId(getCustomerId());
                 inPostOrder.setUserId(userId);
                 transInoutService.creatOrderByPda(inPostOrder);
             }
 
-
         } catch (Exception e) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
-
         return ResultVOUtils.success("上传成功，等待后台处理");
     }
 
@@ -385,7 +382,6 @@ public class IoCodeTempController extends BaseController {
             udiEntity.setSerialNo(addOrderRequest.getSerialNo());
         }
 
-
         if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) {
             return ResultVOUtils.error(500, "无效条码！序列号超出最大范围");
         }
@@ -394,7 +390,6 @@ public class IoCodeTempController extends BaseController {
             return ResultVOUtils.error(500, "无效条码！批次号超出最大范围");
         }
 
-
         //批次号校验
         //判断此产品是否开启允许无批次号
         UdiProductEntity udiInfoEntity = udiProductService.findByNameCode(udiEntity.getUdi());
@@ -511,10 +506,6 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-
-        //过期提醒：
-//        SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip");
-
         if (IntUtil.value(bussinessTypeEntity.getCheckExpire()) == 1 && !addOrderRequest.isIgnoreExpire()) {
             if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
                 String expireDate = "20" + udiEntity.getExpireDate();
@@ -535,7 +526,6 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
         //判断层级标识是否正确
         if (bussinessTypeEntity.isUse()) {
@@ -558,9 +548,6 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-
-        //近效期提醒
-//        SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip");
         long recent = 0;
         if (udiRelevanceResponse.getRecentDateTime() != null)
             recent = udiRelevanceResponse.getRecentDateTime().longValue();
@@ -667,7 +654,6 @@ public class IoCodeTempController extends BaseController {
                 }
             }
 
-
         }
         //        是否检验寄售库存
         if (bussinessTypeEntity.isAdvancePreIn()) {
@@ -954,7 +940,6 @@ public class IoCodeTempController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
         return codeTempService.addDrugOrderWeb(addOrderRequest);
     }
 
@@ -1148,7 +1133,6 @@ public class IoCodeTempController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-
         //更新供应商
         IoCodeTempEntity codeTempEntity = codeTempService.selectById(codeSaveRequest.getId());
         if (StrUtil.isNotEmpty(codeSaveRequest.getMySupId())) {
@@ -1226,7 +1210,6 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-
         boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo());
         boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo());
         if (!r1 && !r2) {
@@ -1315,7 +1298,6 @@ public class IoCodeTempController extends BaseController {
         }
 
         return ResultVOUtils.success();
-
     }
 
 

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

@@ -101,7 +101,6 @@ public class IoOrderController extends BaseController {
     @GetMapping("/udiwms/inout/order/filter")
     public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) {
 
-
         if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
             orderService.setFilterStatus(filterOrderRequest);
         }
@@ -135,7 +134,6 @@ public class IoOrderController extends BaseController {
     @GetMapping("/udiwms/inout/order/filterList")
     public BaseResponse filterOrderList(FilterOrderRequest filterOrderRequest) {
 
-
         if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
             orderService.setFilterStatus(filterOrderRequest);
         }
@@ -163,7 +161,6 @@ public class IoOrderController extends BaseController {
             if (ioOrderResponse.getCheckStatus() == null) {
                 ioOrderResponse.setCheckStatus(0 + "");
             }
-            ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
         }
 
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
@@ -206,7 +203,6 @@ public class IoOrderController extends BaseController {
             return ResultVOUtils.error(500, "请先录入产品！");
         }
 
-        String vailKey = "";
         for (IoOrderDetailBizEntity orderDetailBizEntity : orderDetailBizEntities) {
 
             if (orderDetailBizEntity.getBindRlFk() == null) {
@@ -492,7 +488,6 @@ public class IoOrderController extends BaseController {
         }
     }
 
-
     @Resource
     IoCodeService codeService;
 
@@ -513,7 +508,6 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success("删除成功！");
     }
 
-
     //已验收单据删除、单据编辑删除等
     @AuthRuleAnnotation("")
     @PostMapping("udiwms/inout/order/finish/delete")
@@ -536,7 +530,6 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success("删除成功！");
     }
 
-
     //单据编辑，条码减一
     @AuthRuleAnnotation("")
     @PostMapping("udiwms/inout/code/finish/delete")
@@ -693,8 +686,7 @@ public class IoOrderController extends BaseController {
         }
 
         List<IoOrderResponse> orderEntityList = orderService.filterList(filterOrderRequest);
-        PageInfo<IoOrderResponse> pageInfo;
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(orderEntityList);
-        pageInfo = new PageInfo<>(orderEntityList);
         PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(orderEntityList);
@@ -769,7 +761,6 @@ public class IoOrderController extends BaseController {
         if (null == ioOrderDetailBizEntity) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-//        ioOrderDetailBizEntity.setCheckFileName(ioOrderDetailBizEntity.getCheckFileName().substring(0,ioOrderDetailBizEntity.getCheckFileName().length() - 4));
         orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
         return ResultVOUtils.success();
     }
@@ -781,7 +772,6 @@ public class IoOrderController extends BaseController {
         ioOrderEntity.setUpdateTime(new Date());
         ioOrderEntity.setUpdateUser(getUserId() + "");
         orderService.updateByBillNo(ioOrderEntity);
-//        webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.TASK_SYNC_DELETE).content(ioOrderEntity.getBillNo()).remark("单据删除").build(), null);
         webSocketServer.sendMessage(SocketMsgEntity.builder().type(SocketMsgType.TASK_INVOICE_CONFIRM).content(ioOrderEntity.getBillNo()).remark("发票确认").build(), null);
         return ResultVOUtils.success();
     }
@@ -836,9 +826,7 @@ public class IoOrderController extends BaseController {
     @ApiOperation("udims上传单据")
     @PostMapping("/warehouse/inout/postOrdersUdims")
     public BaseResponse postOrdersUdims(@RequestBody PostUdimsOrderRequest orderRequest) {
-
         ioAddInoutService.creatOrderByUdims(orderRequest);
-
         return ResultVOUtils.success();
     }
 
@@ -912,7 +900,6 @@ public class IoOrderController extends BaseController {
             }
         }
 
-
         originCodes.forEach(
                 code -> {
                     //复制选中的产品
@@ -949,7 +936,6 @@ public class IoOrderController extends BaseController {
         if (!ioCheckInoutService.checkManual(newOrder.getBillNo())) {
             ioCheckInoutService.check(newOrder.getBillNo());
         }
-
         return ResultVOUtils.success();
     }
 
@@ -971,7 +957,6 @@ public class IoOrderController extends BaseController {
             }
         }
 
-
         if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
             orderService.setFilterStatus(filterOrderRequest);
         }
@@ -1030,5 +1015,4 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success(orderEntity);
     }
 
-
 }

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

@@ -110,7 +110,6 @@ public class IoOrderDetailBizController extends BaseController {
     ReceivedetailService receivedetailService;
     @Resource
     IBasicBusTypeChangeService basicBusTypeChangeService;
-
     @Resource
     IoOrderInvoiceService ioOrderInvoiceService;
 
@@ -134,9 +133,7 @@ public class IoOrderDetailBizController extends BaseController {
     @PostMapping("/udiwms/inout/order/addBizProduct")
     @Log(title = "单据管理", businessType = BusinessType.INSERT)
     public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) {
-
         return orderDetailBizService.addBizProduct(addBizProductReqeust);
-
     }
 
 
@@ -205,10 +202,8 @@ public class IoOrderDetailBizController extends BaseController {
             return ResultVOUtils.error(500, "第三方单据所属仓库不能为空！");
         }
 
-
         //获取往来信息
         if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) {//内部调拨
-
             InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByThrCode(thrOrderEntity.getCorpId(), thrOrderEntity.getThirdSysFk());
             orderEntity.setFromDeptCode(invWarehouseEntity.getParentId());
             orderEntity.setFromInvCode(invWarehouseEntity.getCode());
@@ -259,7 +254,6 @@ public class IoOrderDetailBizController extends BaseController {
                     }
                     ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1));
                 }
-
             }
             ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
             ioOrderDetailBizEntity.setProductDate(thrOrderDetailEntity.getProductDate());
@@ -285,7 +279,6 @@ public class IoOrderDetailBizController extends BaseController {
     @Resource
     BasicCorpService basicCorpService;
 
-
     //选入领用单据至业务单据
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/addReceiveOrder")
@@ -414,7 +407,6 @@ public class IoOrderDetailBizController extends BaseController {
             orderDetailBizService.insert(ioOrderDetailBizEntity);
         }
         return ResultVOUtils.success("选入成功！");
-
     }
 
 
@@ -433,8 +425,6 @@ public class IoOrderDetailBizController extends BaseController {
             return ResultVOUtils.success("删除成功！");
         }
         return ResultVOUtils.error(500, "删除失败");
-
-
     }
 
 
@@ -492,11 +482,7 @@ public class IoOrderDetailBizController extends BaseController {
     @PostMapping("/udiwms/inout/biz/updateBind")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse updateBindSup(@RequestBody BizBindUpdateRequest bizBindUpdateRequest) {
-
-
         IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(bizBindUpdateRequest.getId());
-
-
         if (bizBindUpdateRequest.getBindRlFk() != null)
             orderDetailBizEntity.setBindRlFk(bizBindUpdateRequest.getBindRlFk());
         if (StrUtil.isNotEmpty(bizBindUpdateRequest.getSupId())) {
@@ -516,22 +502,18 @@ public class IoOrderDetailBizController extends BaseController {
     @PostMapping("/udiwms/inout/biz/deleteById")
     @Log(title = "发票管理", businessType = BusinessType.DELETE)
     public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) {
-
-
         IoOrderInvoiceResponse ioOrderInvoiceResponse = orderDetailBizService.selectByinvoiceId(ioOrderInvoiceEntity.getId());
 
-        //更改 登记状态
-        IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity();
-
         FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
         FilterOrderDetailBizRequest filterOrderDetailBizRequest1 = new FilterOrderDetailBizRequest();
         filterOrderDetailBizRequest1.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
         filterOrderDetailBizRequest1.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
-
         filterOrderDetailBizRequest.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
         filterOrderDetailBizRequest.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
         filterOrderDetailBizRequest.setRelId(ioOrderInvoiceEntity.getBizIdFk());
 
+        //更改 登记状态
+        IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity();
         ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
         ioOrderDetailBizEntity.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
         ioOrderDetailBizEntity.setBindRlFk(ioOrderInvoiceEntity.getBizIdFk());
@@ -546,8 +528,6 @@ public class IoOrderDetailBizController extends BaseController {
         }
         orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
         return ResultVOUtils.success(ioOrderInvoiceResponses);
-
-
     }
 
     /**
@@ -556,7 +536,6 @@ public class IoOrderDetailBizController extends BaseController {
      * @param ioOrderInvoiceRequest
      * @return
      */
-
     @PostMapping("/udiwms/inout/biz/updateById")
     @Log(title = "发票管理", businessType = BusinessType.UPDATE)
     public BaseResponse updateById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) {
@@ -613,7 +592,6 @@ public class IoOrderDetailBizController extends BaseController {
         orderEntity.setUpdateTime(new Date());
         orderService.update(orderEntity);
         return ResultVOUtils.success("成功");
-
     }
 
 
@@ -641,7 +619,6 @@ public class IoOrderDetailBizController extends BaseController {
         orderEntity.setUpdateTime(new Date());
         orderService.update(orderEntity);
         return ResultVOUtils.success("成功");
-
     }
 
 
@@ -656,9 +633,6 @@ public class IoOrderDetailBizController extends BaseController {
         List<IoOrderDetailResultResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
         List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderDetailBizRequest.getOrderIdFk());
         for (IoOrderDetailResultResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) {
-//            if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
-//                orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
-//            }
             if (orderDetailCodeEntity.getCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
                 orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getCount()).multiply(orderDetailCodeEntity.getPrice()));
             }
@@ -687,7 +661,6 @@ public class IoOrderDetailBizController extends BaseController {
         return ResultVOUtils.page(pageInfo);
     }
 
-
     @Resource
     IoCodeTempService ioCodeTempService;
     @Resource
@@ -697,7 +670,6 @@ public class IoOrderDetailBizController extends BaseController {
     @Resource
     IoCodeLostService ioCodeLostService;
 
-
     //录入阿里送货单的业务单据详情
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/addAliBizProduct")
@@ -730,14 +702,11 @@ public class IoOrderDetailBizController extends BaseController {
             return ResultVOUtils.error("单据码明细为空！");
         }
 
-
         IoOrderEntity ioOrderEntity = addBizProductReqeust.getOrderEntity();
         addBizProductReqeust.setAliOrderBillNo(billCode);
         ioOrderEntity.setAliOrderBillNo(billCode);
         for (int i = 0; i < aliYljgBillDetailDrugList.size(); i++) {
             AliYljgBillDetailDrug aliYljgBillDetailDrug = aliYljgBillDetailDrugList.get(i);
-
-
             AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode1 = aliYljgBillDetailDrug.getAliYljgBillDetailDrugCodeList().get(0);
             String code = aliYljgBillDetailDrugCode1.getCode();
             if (StrUtil.isEmpty(code)) {

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

@@ -71,8 +71,6 @@ public class IoOrderDetailResultController extends BaseController {
     @Resource
     IBasicBussinessTypeService basicBussinessTypeService;
     @Resource
-    IoCodeService codeService;
-    @Resource
     private SystemPDFTemplateService systemPDFTemplateService;
     @Resource
     private SystemPDFModuleService systemPDFModuleService;
@@ -149,15 +147,12 @@ public class IoOrderDetailResultController extends BaseController {
         if (StrUtil.isEmpty(filterErpOrderRequest.getOrderIdFk())) {
             return ResultVOUtils.error(500, "单据号不能为空！");
         }
-        IoOrderEntity orderEntity = orderService.findByBillNo(filterErpOrderRequest.getOrderIdFk());
-        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
         filterErpOrderRequest.setPage(null);
         filterErpOrderRequest.setLimit(null);
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterList(filterErpOrderRequest);
         return ResultVOUtils.success(list);
     }
 
-
     @Resource
     IoOrderDetailBizService orderDetailBizService;
     @Resource
@@ -168,10 +163,8 @@ public class IoOrderDetailResultController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/wditCheck/filterList")
     public BaseResponse waitCheckList(FilterOrderDetailResultRequest orderDetailResultRequest) {
-
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(orderDetailResultRequest.getOrderIdFk());
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailResultRequest.getOrderIdFk());
-
         return ResultVOUtils.success(checkInoutService.combineCheck(orderDetailBizEntities, orderDetailCodeEntities));
     }
 

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

@@ -119,7 +119,6 @@ public class IoOrderInvoiceController extends BaseController {
     public BaseResponse deleteInvoice(@RequestBody DeleteRequest deleteRequest) {
         if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode()))
             return ResultVOUtils.error(500, "发票编码不能为空");
-
         boolean b = ioOrderInvoiceService.remove(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", deleteRequest.getInvoiceEncode()));
         if (b)
             return ResultVOUtils.success("删除成功！");

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

@@ -102,7 +102,6 @@ public class IoOrderReviewController extends BaseController {
             acceptOrderEntity.setExitAccept(false);
         }
         return ResultVOUtils.success(acceptOrderEntity);
-
     }
 
     //获取验收单据业务详情
@@ -327,7 +326,6 @@ public class IoOrderReviewController extends BaseController {
             supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);        //设置状态为补录单据
         }
 
-
         supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);  //设置导出状态为未导出
         supplementOrder.setCorpOrderId(CustomUtil.getId() + "x");
         //修改往来单位及当前库存号
@@ -559,15 +557,12 @@ public class IoOrderReviewController extends BaseController {
         SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest();
         spsSyncDataRequest.setBillNo(reviewSpmsRequest.getBillNo());
         return spsSyncDownloadService.findOrder(spsSyncDataRequest);
-
     }
 
-
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/order/getSimpleOrder")
     public BaseResponse getSimpleOrder(@RequestBody ReviewSpmsRequest reviewSpmsRequest) {
 
-        getUser();
         if (StrUtil.isEmpty(reviewSpmsRequest.getBillNo())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }

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

@@ -19,8 +19,6 @@ import java.util.ArrayList;
 @RestController
 public class IoOrderUploadController {
 
-
-    private static final Logger logger = LoggerFactory.getLogger(IoOrderUploadController.class);
     @Value("${file_path}")
     private String filePath;
     @Value("${API_KEY}")
@@ -35,7 +33,6 @@ public class IoOrderUploadController {
     public BaseResponse uploadFile(HttpServletRequest request,
                                    @RequestParam(value = "content" , required = false) String content,
                                    @RequestParam(value = "files", required = false) MultipartFile[] files) {
-        //
         return receiveFile(request,content,files);
     }
 
@@ -67,7 +64,6 @@ public class IoOrderUploadController {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
             }
-
         }
 
         return ResultVOUtils.success(null);

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

@@ -33,11 +33,9 @@ import java.util.List;
 @RequiredArgsConstructor
 public class IoStatDataController extends BaseController {
 
-
     @Resource
     IoStatDataService ioStatDataService;
 
-
     @GetMapping("/udiwms/inout/stat/filter")
     public void filterList(FilterStatDataRequest statDataRequest) {
         ioStatDataService.getData(statDataRequest);

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

@@ -35,7 +35,6 @@ public class ioCodeRelController {
 
     @GetMapping("/udi/ioCode/Rel/list")
     public BaseResponse list(IoOrderRelRequest ioOrderRelRequest) {
-
         List<IoCodeRelResponse> list = ioCodeRelServicec.selectIoCodeRelList(ioOrderRelRequest);
         PageInfo<IoCodeRelResponse> pageInfo;
         pageInfo = new PageInfo<>(list);
@@ -48,7 +47,6 @@ public class ioCodeRelController {
     @GetMapping("/udi/ioCode/Rel/checkUpProduct")
     public BaseResponse checkUpProduct(String code) {
 
-
         //判断码有没有重复
         List<IoCodeRelEntity> list = ioCodeRelServicec.selectIoCodeRelByCode("", code);
         if (list.size() > 0) {
@@ -145,7 +143,6 @@ public class ioCodeRelController {
         } else {
             return ResultVOUtils.error(999, "删除失败");
         }
-
     }
 
 

src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java

@@ -35,7 +35,6 @@ public class DeviceInspectTakeController {
 
     @Resource
     DeviceInspectTaskService deviceInspectTaskService;
-
     @Resource
     DeviceInspectTaskDetailService deviceInspectTaskDetailService;
     @Resource
@@ -91,7 +90,6 @@ public class DeviceInspectTakeController {
 
     @PostMapping("/udiwms/inv/device/inspect/take/delectDeviceInspecTake")
     public BaseResponse delectDeviceInspecTake(@RequestBody DeviceInspectTaskEntity deviceInspectTaskEntity) {
-
         deviceInspectTaskService.delectDeviceInspectTask(deviceInspectTaskEntity);
         return ResultVOUtils.success(deviceInspectTaskEntity);
     }

src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java

@@ -50,7 +50,6 @@ public class DeviceMAOrderController {
     @Resource
     private SystemPDFModuleService systemPDFModuleService;
 
-
     /**
      * 查询设备养护记录列表
      *

src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java

@@ -35,7 +35,6 @@ public class DeviceProjectSetController {
      */
     @GetMapping("/udiwms/inv/device/project/set/filter")
     public BaseResponse filterList(DeviceProjectSetRequest deviceProjectSetRequest) {
-
         List<DeviceProjectSetResponse> list = deviceProjectSetService.filterList(deviceProjectSetRequest);
         PageInfo<DeviceProjectSetResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
@@ -77,7 +76,6 @@ public class DeviceProjectSetController {
         if(b){
             return ResultVOUtils.error(999,"编码已存在!");
         }
-
         deviceProjectSetService.updateDevprojectSet(deviceProjectSetRequest);
         return ResultVOUtils.success("更新成功");
     }
@@ -92,7 +90,6 @@ public class DeviceProjectSetController {
     @GetMapping("/udiwms/inv/device/project/set/deleteDevprojectSet")
     public BaseResponse deleteDevprojectSet(String id) {
         deviceProjectSetService.deleteDevprojectSet(id);
-
         return ResultVOUtils.success("删除成功");
     }
 

src/main/java/com/glxp/api/controller/inv/InnerOrderController.java

@@ -99,7 +99,6 @@ public class InnerOrderController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(innerOrderEntities);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -110,7 +109,6 @@ public class InnerOrderController {
     @PostMapping()
     @Log(title = "内部码", businessType = BusinessType.INSERT)
     public BaseResponse add(@RequestBody InnerOrderEntity innerOrderEntity) {
-
         innerOrderService.insert(innerOrderEntity);
         return ResultVOUtils.success("新增成功！");
     }
@@ -152,7 +150,6 @@ public class InnerOrderController {
      */
     @PostMapping("/list/detail")
     public BaseResponse detailList(@RequestBody  InnerOrderDetailRequest innerOrderDetailRequest) {
-
         List<innerOrderDetailResponse> purApplyDetailEntities = innerOrderDetailService.joinQueryList(innerOrderDetailRequest);
         PageInfo<innerOrderDetailResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyDetailEntities);
@@ -170,7 +167,6 @@ public class InnerOrderController {
     @PostMapping("/insertDetail")
     @Log(title = "内部码", businessType = BusinessType.INSERT)
     public BaseResponse detailAdd(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) {
-
         innerOrderDetailService.insert(innerOrderDetailEntity);
         return ResultVOUtils.success("");
     }
@@ -221,7 +217,6 @@ public class InnerOrderController {
     @Log(title = "内部码", businessType = BusinessType.DELETE)
     public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
                                      @PathVariable Long[] ids) {
-
         innerOrderDetailService.deleteByIds(Arrays.asList(ids));
         return ResultVOUtils.success("删除成功");
     }

src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java

@@ -95,7 +95,6 @@ public class InvCountOrderController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
         if (null == invCountOrder) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }

src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java

@@ -51,7 +51,6 @@ public class InvInnerOrderPrintController {
 
     @Resource
     private InvInnerOrderPrintService invInnerOrderPrintService;
-
     @Resource
     SystemPDFModuleService systemPDFModuleService;
     @Resource
@@ -83,14 +82,12 @@ public class InvInnerOrderPrintController {
     @PostMapping("/udiwms/innerOrderPrint/addOrderPrint")
     @Log(title = "内部码", businessType = BusinessType.INSERT)
     public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) {
-
         if (invInnerOrderprintReques.getOrderIdFk() != null) {
             invInnerOrderPrintService.addOrderList(invInnerOrderprintReques.getOrderIdFk());
         } else {
             return ResultVOUtils.error(999, "参数错误！");
         }
         return ResultVOUtils.success();
-
     }
 
     //-----------打印码
@@ -184,13 +181,10 @@ public class InvInnerOrderPrintController {
             pageSimpleResponse.setTotal(pageInfo.getTotal());
             pageSimpleResponse.setList(stockPrintTempEntities);
             return ResultVOUtils.success(pageSimpleResponse);
-
         } else {
             Map<String, Object> data = new HashMap<String, Object>();
             data.put("data", printEntities);
             JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf");
-
-
         }
         String orderId = "";
         for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {
@@ -204,9 +198,7 @@ public class InvInnerOrderPrintController {
         //查询订单id
         InvInnerOrderPrintEntity innerOrderPrintEntity = invInnerOrderPrintService.selectById(orderId);
 
-
         //更新内部码状态
-
         InnerOrderEntity innerOrderEntity = innerOrderService.findByRecordKey(innerOrderPrintEntity.getOrderIdFk());
         if (innerOrderEntity != null) {
             innerOrderEntity.setGenStatus(2);
@@ -214,13 +206,11 @@ public class InvInnerOrderPrintController {
             innerOrderService.update(innerOrderEntity);
         }
 
-
         IoOrderEntity ioOrderEntity = new IoOrderEntity();
         ioOrderEntity.setInCodeStatus(1);
         ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk());
         ioOrderService.updateByBillNo(ioOrderEntity);
         return null;
-
     }
 
 
@@ -281,7 +271,6 @@ public class InvInnerOrderPrintController {
             }
         }
 
-
         Map<String, Object> map = new HashMap<>();
         map.put("data", printEntities);
         String param = JSON.toJSONString(map);
@@ -310,7 +299,6 @@ public class InvInnerOrderPrintController {
         ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk());
         ioOrderService.updateByBillNo(ioOrderEntity);
         return null;
-
     }
 
     public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, InnerOrderPrintResponse InnerOrderPrintResponse) {
@@ -325,11 +313,8 @@ public class InvInnerOrderPrintController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/pdf/template/stock/qrcode/text/maxfile")
     public BaseResponse stockQRCodeMaxTextPDFFromTemplateFile(@RequestBody InnerOrderQRCodeTextPDFTemplateRequest innerOrderQRCodeTextPDFTemplateRequest) {
-
         PageSimpleResponse pageSimpleResponse = invInnerOrderPrintService.print(innerOrderQRCodeTextPDFTemplateRequest);
-
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
     @AuthRuleAnnotation("")

src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java

@@ -39,12 +39,11 @@ public class InvPreinOrderController extends BaseController {
     InvPreinOrderService invPreinOrderService;
     @Resource
     InvPreinDetailService invPreinDetailService;
-
     @Resource
     CustomerService customerService;
+
     @GetMapping("/udiwms/inv/prein/filter")
     public BaseResponse filterOrder(FilterInvPreinRequest filterInvPreinRequest) {
-
         if (!isHosUser()) {
             filterInvPreinRequest.setFromCorp(getCustomerId());
         }
@@ -69,13 +68,11 @@ public class InvPreinOrderController extends BaseController {
     @PostMapping("udiwms/inv/prein/delete")
     @Log(title = "预验收单据", businessType = BusinessType.DELETE)
     public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) {
-
         if (StrUtil.isEmpty(deleteRequest.getBillNo()))
             return ResultVOUtils.error(500, "单据号不能为空");
         invPreinOrderService.deleteByOrderId(deleteRequest.getBillNo());
         invPreinDetailService.deleteByOrderId(deleteRequest.getBillNo());
         return ResultVOUtils.success("删除成功！");
-
     }
 
 

src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java

@@ -37,6 +37,7 @@ import java.util.List;
 @Slf4j
 @RestController
 public class InvPreinProductController extends BaseController {
+
     @Resource
     private InvPreinProductDetailService invPreinProductDetailService;
     @Resource
@@ -71,7 +72,6 @@ public class InvPreinProductController extends BaseController {
             filterInvPreinProductRequest.setSupId(getCustomerId());
         }
 
-
         List<InvPreinProductResponse> list = invPreinProductService.filterList(filterInvPreinProductRequest);
         PageInfo<InvPreinProductResponse> pageInfo = new PageInfo<>(list);
         InvPreProductPageResponse<InvPreinProductResponse> pageResponse = new InvPreProductPageResponse<>();

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -53,7 +53,6 @@ public class InvProductController extends BaseController {
     @Resource
     private CustomerService customerService;
 
-
     /**
      * 库存列表查询接口
      *
@@ -67,7 +66,6 @@ public class InvProductController extends BaseController {
             filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
         }
 
-
         if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
             List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
             if (CollUtil.isNotEmpty(invCodes)) {
@@ -81,7 +79,6 @@ public class InvProductController extends BaseController {
             filterInvProductRequest.setSupId(getCustomerId());
         }
 
-
         List<InvProductResponse> list = invProductService.filterListProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
         InvProductPageResponse<InvProductResponse> pageResponse = new InvProductPageResponse();

src/main/java/com/glxp/api/controller/inv/InvRemindMsgController.java

@@ -34,7 +34,6 @@ public class InvRemindMsgController extends BaseController {
      */
     @GetMapping("/udiwms/inv/remind/msg/filter")
     public BaseResponse filterList(FilterInvRemindMsgRequest filterInvRemindMsgRequest) {
-
         if (!isHosUser()) {
             filterInvRemindMsgRequest.setSupId(getCustomerId());
 

src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java

@@ -100,7 +100,7 @@ public class InvRemindSetController {
     /**
      * 通过库存ID查询生成库存预警设置的信息
      *
-     * @param invId
+     * @param filterInvRemindSetRequest
      * @return
      */
     @GetMapping("/udiwms/inv/remind/set/getInfoByInvId")

src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java

@@ -26,7 +26,6 @@ public class InvSickTraceController {
     @Resource
     BasicCorpService basicCorpService;
 
-
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/sick/order/trace")
     public BaseResponse filterSickTrace(FilterSickTraceRequest filterSickTraceRequest) {
@@ -42,8 +41,7 @@ public class InvSickTraceController {
         FilterOrderRequest orderFilterRequest = new FilterOrderRequest();
         orderFilterRequest.setFromCorp(basicCorpEntity.getErpId());
         List<IoOrderResponse> orderEntityList = orderService.filterList(orderFilterRequest);
-        PageInfo<IoOrderResponse> pageInfo;
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(orderEntityList);
-        pageInfo = new PageInfo<>(orderEntityList);
         PageSimpleResponse<IoOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(orderEntityList);

src/main/java/com/glxp/api/controller/inv/UdiTraceController.java

@@ -39,7 +39,6 @@ import java.util.stream.Collectors;
 @RestController
 public class UdiTraceController {
 
-
     @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
@@ -119,9 +118,7 @@ public class UdiTraceController {
                 return udiTraceResponse;
             }).collect(Collectors.toList());
 
-
+            PageInfo<UdiTraceResponse> pageInfo = new PageInfo<>(udiTraceResponseList);
-            PageInfo<UdiTraceResponse> pageInfo;
-            pageInfo = new PageInfo<>(udiTraceResponseList);
             PageSimpleResponse<UdiTraceResponse> pageSimpleResponse = new PageSimpleResponse<>();
             pageSimpleResponse.setTotal(pageInfo.getTotal());
             pageSimpleResponse.setList(udiTraceResponseList);

src/main/java/com/glxp/api/controller/inv/VailInvController.java

@@ -31,6 +31,7 @@ import java.util.List;
  */
 @RestController
 public class VailInvController {
+
     @Resource
     private InvProductService invProductService;
     @Resource
@@ -44,7 +45,6 @@ public class VailInvController {
     @AuthRuleAnnotation("")
     @GetMapping("/spms/inv/product/vail")
     public BaseResponse invProductVail(FilterInvProductRequest filterInvProductRequest) {
-
         List<InvProductResponse> list = invProductService.filterListProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
         InvProductPageResponse<InvProductResponse> pageResponse = new InvProductPageResponse();
@@ -56,7 +56,6 @@ public class VailInvController {
     @AuthRuleAnnotation("")
     @GetMapping("/spms/inv/pre/product/vail")
     public BaseResponse invPreProductVail(FilterInvPreProductRequest filterInvProductRequest) {
-
         List<InvPreProductResponse> list = invPreProductService.filterList(filterInvProductRequest);
         PageInfo<InvPreProductResponse> pageInfo = new PageInfo<>(list);
         InvProductPageResponse<InvPreProductResponse> pageResponse = new InvProductPageResponse();

src/main/java/com/glxp/api/controller/monitor/SysLogininforController.java

@@ -35,10 +35,8 @@ public class  SysLogininforController extends BaseController {
     @SaCheckPermission("monitor:logininfor:list")
     @GetMapping("/list")
     public BaseResponse list(FilterLoginLogRequest filterLoginLogRequest) {
-
         List<SysLogininfor> selectLogininforList = logininforService.selectLogininforList(filterLoginLogRequest);
-        PageInfo<SysLogininfor> pageInfo;
+        PageInfo<SysLogininfor> pageInfo = new PageInfo<>(selectLogininforList);
-        pageInfo = new PageInfo<>(selectLogininforList);
         PageSimpleResponse<SysLogininfor> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(selectLogininforList);

src/main/java/com/glxp/api/controller/monitor/SysOperlogController.java

@@ -34,17 +34,14 @@ public class SysOperlogController extends BaseController {
     @SaCheckPermission("monitor:operlog:list")
     @GetMapping("/list")
     public BaseResponse list(FilterOperLogRequest filterOperLogRequest) {
-
         List<SysOperLog> selectOperLogList = operLogService.selectOperLogList(filterOperLogRequest);
-        PageInfo<SysOperLog> pageInfo;
+        PageInfo<SysOperLog> pageInfo = new PageInfo<>(selectOperLogList);
-        pageInfo = new PageInfo<>(selectOperLogList);
         PageSimpleResponse<SysOperLog> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(selectOperLogList);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-
     /**
      * 批量删除操作日志记录
      *
@@ -54,7 +51,6 @@ public class SysOperlogController extends BaseController {
     @SaCheckPermission("monitor:operlog:remove")
     @DeleteMapping("/{operIds}")
     public BaseResponse remove(@PathVariable Long[] operIds) {
-
         int i = operLogService.deleteOperLogByIds(operIds);
         return ResultVOUtils.success("删除成功！");
     }

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -62,13 +62,10 @@ public class PurApplyController {
     PurPlanService purPlanService;
     @Resource
     PurPlanDetailService purPlanDetailService;
-
-
     @Resource
     CustomerService customerService;
     @Resource
     GennerOrderUtils gennerOrderUtils;
-    IBasicBussinessTypeService basicBussinessTypeService;
 
     /**
      * 新增申购单
@@ -149,7 +146,6 @@ public class PurApplyController {
     @Log(title = "审核申购单", businessType = BusinessType.INSERT)
     public BaseResponse auditOrder(@RequestBody PurApplyResponse purApplyRequest) {
 
-
         Long userId = customerService.getUserId();
         PurApplyEntity purApplyEntity = new PurApplyEntity();
         BeanUtil.copyProperties(purApplyRequest, purApplyEntity);
@@ -203,7 +199,6 @@ public class PurApplyController {
     @PostMapping("/purchase/apply")
     @Log(title = "申购单", businessType = BusinessType.INSERT)
     public BaseResponse add(@RequestBody PurApplyEntity purApplyRequest) {
-
         purApplyService.insert(purApplyRequest);
         return ResultVOUtils.success("新增成功！");
     }
@@ -235,8 +230,6 @@ public class PurApplyController {
                 purApplyDetailService.deleteByOrderId(id + "");
             }
         }
-
-
         return ResultVOUtils.success("删除成功");
     }
 
@@ -246,7 +239,6 @@ public class PurApplyController {
      */
     @GetMapping("/purchase/apply/list/detail")
     public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) {
-
         List<PurOrderDetailResponse> purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest);
         PageInfo<PurOrderDetailResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyDetailEntities);
@@ -254,7 +246,6 @@ public class PurApplyController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyDetailEntities);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
     /**
@@ -264,7 +255,6 @@ public class PurApplyController {
     @PostMapping("/purchase/apply/detail")
     @Log(title = "申购单", businessType = BusinessType.INSERT)
     public BaseResponse detailAdd(@RequestBody PurApplyDetailEntity purApplyDetailEntity) {
-
         purApplyDetailService.insert(purApplyDetailEntity);
         return ResultVOUtils.success("新增成功");
     }
@@ -289,7 +279,6 @@ public class PurApplyController {
     @Log(title = "申购单", businessType = BusinessType.DELETE)
     public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
                                      @PathVariable Long[] ids) {
-
         purApplyDetailService.deleteByIds(Arrays.asList(ids));
         return ResultVOUtils.success("删除成功");
     }
@@ -302,7 +291,6 @@ public class PurApplyController {
     @PostMapping("/purchase/apply/addDetail")
     @Log(title = "申购单", businessType = BusinessType.INSERT)
     public BaseResponse addDetail(@RequestBody PurApplyDetailEntity purApplyDetailEntity) {
-
         purApplyDetailService.insert(purApplyDetailEntity);
         return ResultVOUtils.success(purApplyDetailEntity.getOrderIdFk());
     }
@@ -313,7 +301,6 @@ public class PurApplyController {
     @PostMapping("/purchase/apply/add")
     @Log(title = "申购单", businessType = BusinessType.INSERT)
     public BaseResponse add() {
-
         Long userId = customerService.getUserId();
         PurApplyEntity purApplyEntity = new PurApplyEntity();
         purApplyEntity.setCreateUser(userId + "");
@@ -333,7 +320,6 @@ public class PurApplyController {
     @PostMapping("/purchase/apply/delApplyDetailAll")
     @Log(title = "申购单", businessType = BusinessType.DELETE)
     public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
-
         if(purApplyEntity.getId()!=null){
              purApplyService.deleteById(purApplyEntity.getId());
              purApplyDetailService.deleteByOrderId(purApplyEntity.getId() + "" );

src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java

@@ -54,13 +54,10 @@ import java.util.stream.Collectors;
 @RestController
 public class PurArrivalController extends BaseController {
 
-
     @Resource
     PurArrivalService purArrivalService;
-
     @Resource
     PurArrivalDetailService purArrivalDetailService;
-
     @Resource
     CustomerService customerService;
     @Resource
@@ -69,7 +66,6 @@ public class PurArrivalController extends BaseController {
     IoOrderService ioOrderService;
     @Resource
     IoOrderDetailBizService ioOrderDetailBizService;
-
     @Resource
     InvWarehouseService invWarehouseService;
 
@@ -84,7 +80,6 @@ public class PurArrivalController extends BaseController {
 
         Long userId = getUserId();
         PurArrivalEntity purArrivalEntity = purArrivalRequest.getPurArrivalEntity();
-
         purArrivalEntity.setCreateUser(userId + "");
         purArrivalEntity.setCreateTime(new Date());
         purArrivalEntity.setUpdateTime(new Date());
@@ -118,13 +113,11 @@ public class PurArrivalController extends BaseController {
         }
 
         List<PurArrivalResponse> purArrivalResponses = purArrivalService.queryPageList(purArrivalRequest);
-        PageInfo<PurArrivalResponse> pageInfo;
+        PageInfo<PurArrivalResponse> pageInfo = new PageInfo<>(purArrivalResponses);
-        pageInfo = new PageInfo<>(purArrivalResponses);
         PageSimpleResponse<PurArrivalResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purArrivalResponses);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -144,7 +137,6 @@ public class PurArrivalController extends BaseController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purArrivalResponses);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -164,17 +156,12 @@ public class PurArrivalController extends BaseController {
         String billNo = "";
         List<PurArrivalDetailEntity> purOrderDetailEntities = purArrivalDetailService.findByOrderId(purArrivalEntity.getId() + "");
 
-
         if (postPurArrivalRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
-
-
-
             if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurArrivalRequest.isAutoPurchase() == true
                     && StrUtil.isNotEmpty(postPurArrivalRequest.getTargetSubInv()) && StrUtil.isNotEmpty(postPurArrivalRequest.getTargetBillAction())) {
                 //对计划单里面的供应商进行分组
                 Map<String, List<PurArrivalDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurArrivalDetailEntity::getSupId));
 
-
                 for (Map.Entry<String, List<PurArrivalDetailEntity>> m : map.entrySet()) {
                     //生产单据表信息
                     IoOrderEntity ioOrderEntity = new IoOrderEntity();
@@ -231,7 +218,6 @@ public class PurArrivalController extends BaseController {
      */
     @GetMapping("/purchase/arrival/list/detail")
     public BaseResponse detailList(PurOrderDetailRequest purApplyDetailRequest) {
-
         List<PurArrivalDetailResponse> purOrderDetailResponseList = purArrivalDetailService.joinQueryList(purApplyDetailRequest);
         PageInfo<PurArrivalDetailResponse> pageInfo;
         pageInfo = new PageInfo<>(purOrderDetailResponseList);
@@ -239,7 +225,6 @@ public class PurArrivalController extends BaseController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purOrderDetailResponseList);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -249,14 +234,12 @@ public class PurArrivalController extends BaseController {
     @PostMapping("/purchase/arrival/addOrderDetail")
     @Log(title = "采购单", businessType = BusinessType.INSERT)
     public BaseResponse addOrderDetail(@RequestBody PurArrivalDetailEntity purOrderDetailEntity) {
-
         boolean falg = purArrivalDetailService.insert(purOrderDetailEntity);
         if (falg) {
             return ResultVOUtils.success("添加成功");
         } else {
             return ResultVOUtils.success("添加失败");
         }
-
     }
 
 
@@ -315,12 +298,10 @@ public class PurArrivalController extends BaseController {
     @Log(title = "采购订单", businessType = BusinessType.DELETE)
     public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
                                      @PathVariable Long[] ids) {
-
         purArrivalDetailService.deleteByIds(Arrays.asList(ids));
         return ResultVOUtils.success("删除成功");
     }
 
-
     @Resource
     PurDeliveryDetailService purDeliveryDetailService;
 
@@ -330,8 +311,6 @@ public class PurArrivalController extends BaseController {
     @PostMapping("/purchase/arrival/addPlanDetailAndOrder")
     @Log(title = "送货单", businessType = BusinessType.INSERT)
     public BaseResponse addPlanDetailAndOrder(@RequestBody PurArrivalRequest purArrivalRequest) {
-
-
         List<PurDeliveryDetailEntity> purDeliveryDetailEntities = purDeliveryDetailService.findByOrderId(purArrivalRequest.getPurDeliveryId() + "");
         List<PurArrivalDetailEntity> purArrivalDetailEntities = purDeliveryDetailEntities.stream()
                 .map(e -> {

src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java

@@ -135,7 +135,6 @@ public class PurDeliveryController extends BaseController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purDeliveryResponses);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -155,7 +154,6 @@ public class PurDeliveryController extends BaseController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purDeliveryResponses);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -247,7 +245,6 @@ public class PurDeliveryController extends BaseController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purDeliveryDetailResponses);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
     /**
@@ -446,7 +443,6 @@ public class PurDeliveryController extends BaseController {
     @Log(title = "采购订单", businessType = BusinessType.DELETE)
     public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
                                      @PathVariable Long[] ids) {
-
         purDeliveryDetailService.deleteByIds(Arrays.asList(ids));
         return ResultVOUtils.success("删除成功");
     }

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -57,12 +57,10 @@ public class PurOrderController {
 
     @Resource
     PurOrderService purOrderService;
-
     @Resource
     PurPlanDetailService purPlanDetailService;
     @Resource
     PurOrderDetailService purOrderDetailService;
-
     @Resource
     CustomerService customerService;
     @Resource
@@ -85,7 +83,6 @@ public class PurOrderController {
 
         Long userId = customerService.getUserId();
         PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
-
         purOrderEntity.setCreateUser(userId + "");
         purOrderEntity.setCreateTime(new Date());
         purOrderEntity.setUpdateTime(new Date());
@@ -122,13 +119,11 @@ public class PurOrderController {
             purOrderRequest.setSupId(customerId);
         }
         List<PurOrderResponse> purApplyEntities = purOrderService.queryPageList(purOrderRequest);
-        PageInfo<PurOrderResponse> pageInfo;
+        PageInfo<PurOrderResponse> pageInfo = new PageInfo<>(purApplyEntities);
-        pageInfo = new PageInfo<>(purApplyEntities);
         PageSimpleResponse<PurOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -167,7 +162,6 @@ public class PurOrderController {
             //对计划单里面的供应商进行分组
             Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
 
-
             if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true
                     && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) {
 
@@ -220,7 +214,6 @@ public class PurOrderController {
 
         }
 
-
         return ResultVOUtils.success("更新成功！");
     }
 
@@ -307,13 +300,11 @@ public class PurOrderController {
     public BaseResponse detailList(PurOrderDetailRequest purApplyDetailRequest) {
 
         List<PurOrderDetailResponse> purOrderDetailResponseList = purOrderDetailService.joinQueryList(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
+        PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(purOrderDetailResponseList);
-        pageInfo = new PageInfo<>(purOrderDetailResponseList);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purOrderDetailResponseList);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -322,7 +313,6 @@ public class PurOrderController {
      */
     @GetMapping("/purchase/order/drug/list/detail")
     public BaseResponse drugDetailList(PurOrderDetailRequest purApplyDetailRequest) {
-
         List<PurOrderDetailResponse> purOrderDetailResponseList = purOrderDetailService.joinQueryDrugList(purApplyDetailRequest);
         PageInfo<PurOrderDetailResponse> pageInfo;
         pageInfo = new PageInfo<>(purOrderDetailResponseList);
@@ -330,7 +320,6 @@ public class PurOrderController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purOrderDetailResponseList);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
     /**
@@ -344,7 +333,6 @@ public class PurOrderController {
         if (purOrderRequest.getApplyId() == null || purOrderRequest.getId() == null) {
             return ResultVOUtils.error(999, "参数错误！");
         }
-
         //查询申购单详情
         PurPlanDetailRequest purPlanDetailRequest = new PurPlanDetailRequest();
         purPlanDetailRequest.setOrderIdFk(purOrderRequest.getApplyId() + "");
@@ -366,7 +354,6 @@ public class PurOrderController {
         PurOrderDetailRequest.setOrderIdFk(purOrderRequest.getId() + "");
         List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.getPurOrderDetailEntityList(PurOrderDetailRequest);
 
-
         List<Long> ids = new ArrayList<>();
         for (PurOrderDetailEntity obj : purOrderDetailEntities) {
             for (PurOrderDetailEntity obj1 : purOrderDetailEntityList) {
@@ -435,7 +422,6 @@ public class PurOrderController {
     @PostMapping("/purchase/order/delOrderDetailAll")
     @Log(title = "申购单", businessType = BusinessType.DELETE)
     public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) {
-
         if (purApplyEntity.getId() != null) {
             purOrderService.deleteById(purApplyEntity.getId());
             purOrderDetailService.deleteByOrderId(purApplyEntity.getId() + "");
@@ -465,7 +451,6 @@ public class PurOrderController {
     @Log(title = "采购订单", businessType = BusinessType.DELETE)
     public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
                                      @PathVariable Long[] ids) {
-
         purOrderDetailService.deleteByIds(Arrays.asList(ids));
         return ResultVOUtils.success("删除成功");
     }

src/main/java/com/glxp/api/controller/purchase/PurPlanController.java

@@ -73,7 +73,6 @@ public class PurPlanController {
     PurApplyDetailService purApplyDetailService;
     @Resource
     PurPlanDetailService purPlanDetailService;
-
     @Resource
     CustomerService customerService;
     @Resource
@@ -95,7 +94,6 @@ public class PurPlanController {
 
         Long userId = customerService.getUserId();
         PurPlanEntity purPlanEntity = postPurPlanRequest.getPurPlanEntity();
-
         purPlanEntity.setCreateUser(userId + "");
         purPlanEntity.setCreateTime(new Date());
         purPlanEntity.setUpdateTime(new Date());
@@ -113,8 +111,6 @@ public class PurPlanController {
             purPlanService.update(purPlanEntity);
         }
 
-
-
         return ResultVOUtils.success("提交成功！");
     }
 
@@ -136,7 +132,6 @@ public class PurPlanController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -156,7 +151,6 @@ public class PurPlanController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyEntities);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
     /**
@@ -259,7 +253,6 @@ public class PurPlanController {
      */
     @GetMapping("/purchase/plan/list/detail")
     public BaseResponse detailList(PurPlanDetailRequest purApplyDetailRequest) {
-
         List<PurOrderDetailResponse> purApplyDetailEntities = purPlanDetailService.joinQueryList(purApplyDetailRequest);
         PageInfo<PurOrderDetailResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyDetailEntities);
@@ -267,7 +260,6 @@ public class PurPlanController {
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyDetailEntities);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
     /**
@@ -302,7 +294,6 @@ public class PurPlanController {
         purPlanDetailRequest.setOrderIdFk(purPlanRequest.getId() + "");
         List<PurPlanDetailEntity> purApplyDetailEntities=purPlanDetailService.getPurPlanDetailEntityList(purPlanDetailRequest);
 
-
         List<Long> ids=new ArrayList<>();
         for (PurPlanDetailEntity obj:purApplyDetailEntities){
             for (PurPlanDetailEntity obj1:purPlanDetailEntityList){
@@ -342,7 +333,6 @@ public class PurPlanController {
        }else {
            return ResultVOUtils.success("添加失败");
        }
-
     }
 
 
@@ -400,7 +390,6 @@ public class PurPlanController {
     @Log(title = "采购计划", businessType = BusinessType.DELETE)
     public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
                                      @PathVariable Long[] ids) {
-
         purPlanDetailService.deleteByIds(Arrays.asList(ids));
         return ResultVOUtils.success("删除成功");
     }

src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java

@@ -56,10 +56,8 @@ public class PurReturnedController extends BaseController {
 
     @Resource
     PurReturnedService purReturnedService;
-
     @Resource
     PurReturnedDetailService purReturnedDetailService;
-
     @Resource
     CustomerService customerService;
     @Resource
@@ -118,13 +116,11 @@ public class PurReturnedController extends BaseController {
         }
 
         List<PurReturnedResponse> purReturnedResponses = purReturnedService.queryPageList(purReturnedRequest);
-        PageInfo<PurReturnedResponse> pageInfo;
+        PageInfo<PurReturnedResponse> pageInfo = new PageInfo<>(purReturnedResponses);
-        pageInfo = new PageInfo<>(purReturnedResponses);
         PageSimpleResponse<PurReturnedResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purReturnedResponses);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -138,8 +134,7 @@ public class PurReturnedController extends BaseController {
             purReturnedRequest.setStatus(10);  //查询未审核和已审核状态
         }
         List<PurReturnedResponse> purReturnedResponses = purReturnedService.queryPageList(purReturnedRequest);
-        PageInfo<PurReturnedResponse> pageInfo;
+        PageInfo<PurReturnedResponse> pageInfo = new PageInfo<>(purReturnedResponses);
-        pageInfo = new PageInfo<>(purReturnedResponses);
         PageSimpleResponse<PurReturnedResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purReturnedResponses);
@@ -164,7 +159,6 @@ public class PurReturnedController extends BaseController {
         String billNo = "";
         List<PurReturnedDetailEntity> purReturnedDetailEntities = purReturnedDetailService.findByOrderId(purReturnedEntity.getId() + "");
 
-
         if (postPurReturnedRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
 
             if (CollUtil.isNotEmpty(purReturnedDetailEntities) && postPurReturnedRequest.isAutoPurchase() == true
@@ -312,7 +306,6 @@ public class PurReturnedController extends BaseController {
     @Log(title = "采购订单", businessType = BusinessType.DELETE)
     public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
                                      @PathVariable Long[] ids) {
-
         purReturnedDetailService.deleteByIds(Arrays.asList(ids));
         return ResultVOUtils.success("删除成功");
     }

src/main/java/com/glxp/api/controller/purchase/SupCertController.java

@@ -58,10 +58,8 @@ public class SupCertController {
     private AuthAdminService authAdminService;
     @Resource
     private SupCertService supCertService;
-
     @Value("${file_path}")
     private String filePath;
-
     @Resource
     private SystemPDFTemplateService systemPDFTemplateService;
     @Resource
@@ -77,71 +75,13 @@ public class SupCertController {
         }
         List<SupCertEntity> supCertEntityList
                 = supCertService.filterCompanyCert(filterSupCertRequest);
-        PageInfo<SupCertEntity> pageInfo;
+        PageInfo<SupCertEntity> pageInfo = new PageInfo<>(supCertEntityList);
-        pageInfo = new PageInfo<>(supCertEntityList);
         PageSimpleResponse<SupCertEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(supCertEntityList);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-
-    private BaseResponse insertCompanyCert(String customerId, PostSelCertRequest request) {
-        if (CollUtil.isEmpty(request.getSupCertSetEntities())) {
-            return ResultVOUtils.error(500, "请选入资质证书！");
-        }
-        if (request.getCertType() == null) {
-            return ResultVOUtils.error(500, "参数错误！");
-        }
-
-        int certType = request.getCertType();
-        String productIdFk = request.getProductIdFk();
-        String manufacturerIdFk = request.getManufacturerIdFk();
-
-        String errMsg = "";
-        ArrayList<String> list = new ArrayList<>();
-        int i = request.getSupCertSetEntities().size();
-        for (SupCertSetEntity supCertSetEntity : request.getSupCertSetEntities()) {
-            i--;
-            FilterSupCertRequest supCertRequest = new FilterSupCertRequest();
-            supCertRequest.setName(supCertSetEntity.getName());
-            supCertRequest.setCustomerId(customerId);
-            supCertRequest.setManufacturerIdFk(manufacturerIdFk);
-            if (productIdFk != null) {
-                supCertRequest.setProductIdFk(productIdFk);
-                supCertRequest.setType(3);
-            } else {
-                supCertRequest.setType(2);
-            }
-
-            List<SupCertEntity> supCertEntities = supCertService.selectCompanyCert(supCertRequest);
-            if (!supCertEntities.isEmpty()) {
-                list.add(supCertEntities.get(0).getName());
-                if (i == 0) {
-                    errMsg = list.stream().map(s -> "," + s).collect(Collectors.joining());
-                    return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！");
-                }
-            }
-        }
-
-        for (SupCertSetEntity supCertSetEntity : request.getSupCertSetEntities()) {
-            SupCertEntity supCertEntity = new SupCertEntity();
-            supCertEntity.setName(supCertSetEntity.getName());
-            supCertEntity.setManufacturerIdFk(manufacturerIdFk);
-            supCertEntity.setProductIdFk(productIdFk);
-            supCertEntity.setCustomerId(customerId);
-            supCertEntity.setType(certType);
-            supCertEntity.setCreateTime(new Date());
-            supCertEntity.setStatus(0);
-            supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT);
-            supCertEntity.setUpdateTime(new Date());
-            supCertEntity.setId(IdUtil.getSnowflakeNextId());
-            boolean b = supCertService.insertCompanyCert(supCertEntity);
-        }
-        return ResultVOUtils.success("成功");
-    }
-
-
     @AuthRuleAnnotation("")
     @PostMapping("/sup/info/selectAllCert")
     @Log(title = "资质证书", businessType = BusinessType.INSERT)
@@ -288,8 +228,6 @@ public class SupCertController {
             supProductEntity.setAuditStatus(ConstantStatus.AUDIT_UN);
             supProductService.modifyRegistration(supProductEntity);
         }
-
-
         return ResultVOUtils.success("成功");
     }
 
@@ -308,14 +246,12 @@ public class SupCertController {
         SupCertEntity supCertEntity = new SupCertEntity();
         BeanUtil.copyProperties(postSupCertRequest, supCertEntity);
 
-
         if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) {
             if (postSupCertRequest.getVailDate().getTime() > postSupCertRequest.getExpireDate().getTime()) {
                 return ResultVOUtils.error(999, "失效期不能小于生效期！");
             }
         }
 
-
         if (postSupCertRequest.getRepeatUpload() == 1) {
             //已审核的重新提交
             //1.修改对应的资质信息进入变更审核状态，
@@ -409,7 +345,6 @@ public class SupCertController {
         List<Object> list = new ArrayList<>();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式
 
-
         //查询配送企业信息
         SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(purPlanPrintRequest.getCustomerId());
         //查询详情
@@ -520,7 +455,6 @@ public class SupCertController {
         List<Object> list = new ArrayList<>();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式
 
-
         FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest();
         filterSupManufacturerRequest.setId(purPlanPrintRequest.getId());
         //查询生产企业信息
@@ -608,9 +542,7 @@ public class SupCertController {
                     supData.put("productType", supProductEntity.getProductType() == null ? ' ' : supProductEntity.getProductType());
                     supData.put("productDirectoryCode", supProductEntity.getProductDirectoryCode() == null ? ' ' : supProductEntity.getProductDirectoryCode());
                     supData.put("specification", supProductEntity.getSpecification() == null ? ' ' : supProductEntity.getSpecification());
-//                supData.put("cpms", supProductEntity.getCpms() == null ? ' ' : supProductEntity.getCpms());
                     supData.put("remark1", supProductEntity.getRemark() == null ? ' ' : supProductEntity.getRemark());
-
                     supData.put("index", String.valueOf(i));
                     supData.put("name", obj.getName() == null ? ' ' : obj.getName());
                     supData.put("code", obj.getCode() == null ? ' ' : obj.getCode());

src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java

@@ -43,8 +43,7 @@ public class SupCertSetController {
 
         List<SupCertSetEntity> supCertEntityList
                 = supCertSetService.filterCertSets(filterCertSetsRequest);
-        PageInfo<SupCertSetEntity> pageInfo;
+        PageInfo<SupCertSetEntity> pageInfo = new PageInfo<>(supCertEntityList);
-        pageInfo = new PageInfo<>(supCertEntityList);
         PageSimpleResponse<SupCertSetEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(supCertEntityList);
@@ -107,7 +106,6 @@ public class SupCertSetController {
     @PostMapping("/sup/cert/set/delete")
     @Log(title = "资质证书", businessType = BusinessType.DELETE)
     public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) {
-
         boolean b = supCertSetService.deleteById(deleteRequest.getId());
         return ResultVOUtils.success("删除成功！");
     }

src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java

@@ -52,9 +52,6 @@ import java.util.ListIterator;
 @RestController
 public class SupCompanyController {
 
-    @Value("${file_path}")
-    private String filePath;
-
     @Resource
     private AuthAdminService authAdminService;
     @Resource
@@ -78,7 +75,6 @@ public class SupCompanyController {
     @AuthRuleAnnotation("")
     @GetMapping("/api/pur/getSupComapnys")
     public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) {
-        System.out.println(companyRequest.toString());
         List<SupCompanyEntity> companyEntities = companyService.filterCompany(companyRequest);
         PageInfo<SupCompanyEntity> pageInfo = new PageInfo<>(companyEntities);
         PageSimpleResponse<SupCompanyEntity> pageSimpleResponse = new PageSimpleResponse<>();
@@ -92,8 +88,6 @@ public class SupCompanyController {
     @PostMapping("/api/pur/addCompany")
     @Log(title = "资质证书", businessType = BusinessType.INSERT)
     public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) {
-
-
         //判断是不是存在草稿
         if (companyEntity.getAuditStatus() == 6) {
             List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
@@ -132,8 +126,6 @@ public class SupCompanyController {
                 }
                 return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
             }
-
-
         }
 
         String customerId = CustomUtil.getId();     //重新生成customerId
@@ -191,7 +183,6 @@ public class SupCompanyController {
                         }
                     }
                 }
-
             }
             String errMsg = "";
             if (supCertSetEntities.size() > 0) {
@@ -202,7 +193,6 @@ public class SupCompanyController {
             }
         }
 
-
         companyEntity.setUpdateTime(new Date());
         boolean b = companyService.modifyCompany(companyEntity);
         CustomerContactEntity customerContactEntity = new CustomerContactEntity();
@@ -223,7 +213,6 @@ public class SupCompanyController {
     @Log(title = "资质证书", businessType = BusinessType.UPDATE)
     public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) {
 
-
         if (companyEntity.getAuditStatus() == 1) {
             //查询用户上传的证书
             FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
@@ -251,9 +240,7 @@ public class SupCompanyController {
                         }
                     }
                 }
-
             }
-            String errMsg = "";
             if (supCertSetEntities.size() > 0) {
                 return ResultVOUtils.error(500, "必传证书不齐全！");
             }
@@ -293,7 +280,6 @@ public class SupCompanyController {
             }
         }
 
-
         AuthAdmin authAdmin = getUser();
         companyEntity.setAuditor(authAdmin.getId() + "");
         companyEntity.setAuditTime(new Date());
@@ -323,7 +309,6 @@ public class SupCompanyController {
         if (!basicCorpDao.exists(new QueryWrapper<BasicCorpEntity>().eq("erpId", companyEntity.getCustomerId()))) {
             basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
             basicCorpService.insert(basicCorpEntity);
-        } else {
         }
 
         //更新移除预警信息
@@ -366,7 +351,6 @@ public class SupCompanyController {
     @GetMapping("api/pur/supCompany/getRoId")
     public BaseResponse getRoId(String companyId) {
         CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(companyId);
-
         return ResultVOUtils.success(customerInfoEntity);
     }
 

src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java

@@ -43,7 +43,6 @@ import java.util.Objects;
 @RestController
 public class SupManufacturerController {
 
-
     @Resource
     private AuthAdminService authAdminService;
     @Resource
@@ -54,8 +53,6 @@ public class SupManufacturerController {
     private SupCompanyService supCompanyService;
     @Resource
     SupCertSetService supCertSetService;
-    @Resource
-    private CompanyService companyService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/sup/manufacturer/getCompanyInfo")
@@ -82,7 +79,6 @@ public class SupManufacturerController {
     @AuthRuleAnnotation("")
     @GetMapping("/sup/manufacturer/getCompanyBySup")
     public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) {
-//        filterSupManufacturerRequest.setCustomerId(getCustomerId());
         List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
         PageInfo<SupManufacturerEntity> pageInfo = new PageInfo<>(companyEntities);
         PageSimpleResponse<SupManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
@@ -166,8 +162,6 @@ public class SupManufacturerController {
                 } else {
                     iterable.remove();
                 }
-
-
             }
             String errMsg = "";
             if (supCertSetEntities.size() > 0) {
@@ -176,8 +170,6 @@ public class SupManufacturerController {
                 }
                 return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
             }
-
-
         }
 
         supManufacturerEntity.setCreateTime(new Date());
@@ -270,8 +262,6 @@ public class SupManufacturerController {
                 } else {
                     iterable.remove();
                 }
-
-
             }
             String errMsg = "";
             if (supCertSetEntities.size() > 0) {
@@ -280,11 +270,8 @@ public class SupManufacturerController {
                 }
                 return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
             }
-
-
         }
 
-
         supManufacturerEntity.setUpdateTime(new Date());
         SupManufacturerEntity originEntity = supManufacturerService.findManufacturer(supManufacturerEntity.getManufacturerId());
         boolean b = supManufacturerService.modifyCompany(supManufacturerEntity);
@@ -310,7 +297,6 @@ public class SupManufacturerController {
             return ResultVOUtils.error(500, "参数错误！");
         }
 
-
         if (supManufacturerEntity.getAuditStatus() == 1 || supManufacturerEntity.getAuditStatus() == 4) {
             //查询上传的资质证书
             FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
@@ -403,7 +389,6 @@ public class SupManufacturerController {
         else {
             return ResultVOUtils.error(500, "删除失败");
         }
-
     }
 
     public String getCustomerId() {

src/main/java/com/glxp/api/controller/purchase/SupProductController.java

@@ -50,6 +50,7 @@ import java.util.ListIterator;
 
 @RestController
 public class SupProductController {
+
     @Resource
     private AuthAdminService authAdminService;
     @Resource
@@ -67,7 +68,6 @@ public class SupProductController {
 
     @AuthRuleAnnotation("")
     @GetMapping("/sup/product/getRegistrationInfo")
-
     public BaseResponse getRegistrationInfo(FilterPoductRequest filterPoductRequest) {
         SupProductEntity supProductEntity = supProductService.findRegistration(filterPoductRequest.getId());
         if (supProductEntity != null) {

src/main/java/com/glxp/api/controller/sup/CustomerController.java

@@ -60,13 +60,12 @@ public class CustomerController {
     private  AlihealthUtils alihealthUtils;
     @Value("${ALIHEALTH_URL:http://gw.api.taobao.com/router/rest}")
     private String alihealthUrl;
+
     @AuthRuleAnnotation("")
     @GetMapping("/spms/customer/list")
     public BaseResponse filterCustomers(CustomerInfoFilterRequest customerFilterRequest) {
-
         List<CustomerInfoEntity> customerDetailEntities = customerInfoService.filterCustomerInfo(customerFilterRequest);
-        PageInfo<CustomerInfoEntity> pageInfo;
+        PageInfo<CustomerInfoEntity> pageInfo = new PageInfo<>(customerDetailEntities);
-        pageInfo = new PageInfo<>(customerDetailEntities);
         PageSimpleResponse<CustomerInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(customerDetailEntities);
@@ -82,8 +81,7 @@ public class CustomerController {
             DictDto dictDto = new DictDto(s.getCustomerId().toString(),s.getCompanyName());
             return dictDto;
         }).collect(Collectors.toList());
-        PageInfo<DictDto> pageInfo;
+        PageInfo<DictDto> pageInfo = new PageInfo<>(reList);
-        pageInfo = new PageInfo<>(reList);
         PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(reList);
@@ -171,7 +169,6 @@ public class CustomerController {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
 
-
         return ResultVOUtils.success("更新成功");
     }
 

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

@@ -40,10 +40,14 @@ import java.util.Date;
 @Slf4j
 public class SpsSyncBasicController {
 
-    private final UdiRelevanceDao udiRelevanceDao;
+    @Resource
-    private final BasicProductsDao basicProductsDao;
+    UdiRelevanceDao udiRelevanceDao;
-    private final CompanyProductRelevanceDao relevanceDao;
+    @Resource
-    private final UdiProductService udiProductService;
+    BasicProductsDao basicProductsDao;
+    @Resource
+    CompanyProductRelevanceDao relevanceDao;
+    @Resource
+    UdiProductService udiProductService;
     @Resource
     ThrProductsAddDiDao thrProductsAddDiDao;
     @Resource

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

@@ -128,15 +128,14 @@ public class SpsSyncDownloadController {
     WarehouseBussinessTypeDao warehouseBussinessTypeDao;
     @Resource
     WarehouseUserDao warehouseUserDao;
-    private final InvSpaceDao invSpaceDao;
+    @Resource
-
+    InvSpaceDao invSpaceDao;
 
     //    下发单据接口 ，供给中继服务，UDI管理系统下载
     @AuthRuleAnnotation("")
     @GetMapping("sps/sync/order")
     public BaseResponse getOrder(SpsSyncDataRequest spsSyncDataRequest) {
         BasicExportStatusEntity basicExportStatusEntity = basicExportService.findByData(ConstantStatus.SYNC_SCAN_ORDER, 3);
-        String logs = "";
         BaseResponse<SpsSyncOrderResponse> baseResponse = new BaseResponse<>();
         if (basicExportStatusEntity != null) {
             if (StrUtil.isBlank(basicExportStatusEntity.getCacheFilePath())) {
@@ -171,7 +170,6 @@ public class SpsSyncDownloadController {
 
         BaseResponse<SpSyncUdiResponse> baseResponse = ResultVOUtils.error(ResultEnum.NOT_NETWORK.getCode(), "");
         BasicExportStatusEntity basicExportStatusEntity = basicExportService.findByData(ConstantStatus.SYNC_DI_PRODUCTS, 3);
-        String logs = "";
         if (basicExportStatusEntity != null) {
             baseResponse = spsSyncDownloadService.syncUdi(spsSyncDataRequest);
 
@@ -291,14 +289,6 @@ public class SpsSyncDownloadController {
                 } 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.setCode(ResultVOUtils.success().getCode());
@@ -567,20 +557,6 @@ public class SpsSyncDownloadController {
         }
     }
 
-
-    private final IoCodeLostMapper ioCodeLostMapper;
-    private final IoCodeRelMapper ioCodeRelMapper;
-    private final BasicHospTypeDao basicHospTypeDao;
-    private final UdiRelevanceDao udiRelevanceDao;
-    private final BasicProductsDao basicProductsDao;
-    private final CompanyProductRelevanceDao relevanceDao;
-    private final BasicCorpDao corpDao;
-    private final SupCertDao supCertDao;
-    private final SupCertSetDao supCertSetDao;
-    private final SupCompanyDao supCompanyDao;
-    private final SupManufacturerDao supManufacturerDao;
-    private final SupProductDao supProductDao;
-
     @Resource
     DeviceInspectTaskMapper deviceInspectTaskMapper;
     @Resource
@@ -615,19 +591,14 @@ public class SpsSyncDownloadController {
     DeviceCheckItemDictMapper deviceCheckItemDictMapper;
     @Resource
     DeviceRepairApplyMapper deviceRepairApplyMapper;
-
     @Resource
     DeviceRepairApplyDetailMapper deviceRepairApplyDetailMapper;
-
     @Resource
     DeviceRepairMapper deviceRepairMapper;
-
     @Resource
     DeviceUpkeepMapper deviceUpkeepMapper;
-
     @Resource
     DeviceUpkeepDetailMapper deviceUpkeepDetailMapper;
-
     @Resource
     DeviceUpkeepDetailItemMapper deviceUpkeepDetailItemMapper;
 
@@ -804,7 +775,6 @@ public class SpsSyncDownloadController {
                         orderEntity.setFromCorp("科室使用出库");
                     }
 
-
                     orderEntity.setId(null);
                     orderDao.insert(orderEntity);
                     //更新码详情
@@ -840,7 +810,6 @@ public class SpsSyncDownloadController {
                         }
                     }
 
-
                     //更新结果详情
                     if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailResultEntities())) {
                         List<IoOrderDetailResultEntity> orderDetailResultEntities = syncDataResponse.getOrderDetailResultEntities();
@@ -852,7 +821,6 @@ public class SpsSyncDownloadController {
                         }
                     }
 
-
                     //更新发票信息
                     if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
                         List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
@@ -920,7 +888,6 @@ public class SpsSyncDownloadController {
         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS);
         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
 
-
         return ResultVOUtils.success("上传成功！");
     }
 
@@ -985,7 +952,6 @@ public class SpsSyncDownloadController {
             e.printStackTrace();
         }
         basicDownloadStatusEntity.setCacheFilePath(fileFullPath);
-
         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
 
         return ResultVOUtils.success("上传成功！");
@@ -1119,7 +1085,6 @@ public class SpsSyncDownloadController {
                 remark.append("仓库字典：").append(syncDataResponse.getInvWarehouseEntities().size()).append("条\n");
             }
 
-
             //仓库用户表
             if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) {
                 for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) {
@@ -1136,7 +1101,6 @@ public class SpsSyncDownloadController {
                 remark.append("仓库所属单据类型：").append(syncDataResponse.getWarehouseBussinessTypeEntities().size()).append("条\n");
             }
 
-
             batchSession.close();
             basicDownloadStatusEntity.setStatus(1);
             basicDownloadStatusEntity.setUpdateTime(new Date());
@@ -1421,6 +1385,5 @@ public class SpsSyncDownloadController {
         }
     }
 
-
 }
 

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

@@ -68,8 +68,7 @@ public class SpsSyncExportStatusController {
     @GetMapping("/spssync/basic/udiinfo/filter")
     public BaseResponse filterStatus(BasicExportStatusRequest basicExportStatusRequest) {
         List<BasicExportStatusEntity> basicExportStatusEntities = basicExportService.filterExportStatus(basicExportStatusRequest);
-        PageInfo<BasicExportStatusEntity> pageInfo;
+        PageInfo<BasicExportStatusEntity> pageInfo = new PageInfo<>(basicExportStatusEntities);
-        pageInfo = new PageInfo<>(basicExportStatusEntities);
         PageSimpleResponse<BasicExportStatusEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicExportStatusEntities);

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

@@ -182,14 +182,8 @@ public class SyncDelController extends BaseController {
 
 
     public BaseResponse deleteBasicUnitMaintain(DeleteRequest deleteRequest) {
-
-
         String id = deleteRequest.getId();
-        BasicCorpEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(id);
-
         basicUnitMaintainService.deleteById(id);
-
-
         return ResultVOUtils.success("删除成功");
     }
 
@@ -217,7 +211,6 @@ public class SyncDelController extends BaseController {
             return ResultVOUtils.error(500, "该单据类型已被仓库绑定，请先移除后删除！");
         }
 
-
         return basicBussinessTypeService.deleteBussinessType(id) == true ? ResultVOUtils.success("删除成功") : ResultVOUtils.error(500, "删除失败，系统繁忙");
     }
 

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

@@ -48,7 +48,6 @@ public class TestController {
             if (file.isEmpty()) {
                 return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败");
             }
-            String fileName = file.getOriginalFilename();
             try {
                 IDCUtils.writeFile(file.getBytes(), filePath + file.getName(), file.getOriginalFilename());
             } catch (Exception e) {

src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java

@@ -22,8 +22,7 @@ public class ClassifyCodeController {
     @GetMapping("spms/classify/code/filter")
     public BaseResponse filterList(FilterClassifyCodeRequest filterDeviceKeyRequest) {
         List<ClassifyCodeEntity> classifyCodeEntities = classifyCodeService.filteClassifyCode(filterDeviceKeyRequest);
-        PageInfo<ClassifyCodeEntity> pageInfo;
+        PageInfo<ClassifyCodeEntity> pageInfo = new PageInfo<>(classifyCodeEntities);
-        pageInfo = new PageInfo<>(classifyCodeEntities);
         PageSimpleResponse<ClassifyCodeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(classifyCodeEntities);

src/main/java/com/glxp/api/controller/system/CompanyController.java

@@ -32,9 +32,7 @@ public class CompanyController {
     @PostMapping("/warehouse/info/modifyCompany")
     @Log(title = "企业信息", businessType = BusinessType.UPDATE)
     public BaseResponse modifyCompany(@RequestBody CompanyEntity companyEntity) {
-
         boolean b = companyService.modifyCompany(companyEntity);
-
         return ResultVOUtils.success("修改成功");
     }
 }

src/main/java/com/glxp/api/controller/system/ConnectTestController.java

@@ -25,7 +25,6 @@ public class ConnectTestController {
         authConnectEntity.setCompanyName(companyEntity.getName());
         authConnectEntity.setSysName("UDI自助平台");
         return ResultVOUtils.success(authConnectEntity);
-
     }
 
 

src/main/java/com/glxp/api/controller/system/DeviceKeyController.java

@@ -34,8 +34,7 @@ public class DeviceKeyController {
     @GetMapping("sale/device/registerList")
     public BaseResponse registerList(FilterDeviceKeyRequest filterDeviceKeyRequest) {
         List<SysPdaKeyEntity> deviceKeyEntities = sysPdaKeyService.findDeviceKey(filterDeviceKeyRequest);
-        PageInfo<SysPdaKeyEntity> pageInfo;
+        PageInfo<SysPdaKeyEntity> pageInfo = new PageInfo<>(deviceKeyEntities);
-        pageInfo = new PageInfo<>(deviceKeyEntities);
         PageSimpleResponse<SysPdaKeyEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(deviceKeyEntities);
@@ -47,7 +46,6 @@ public class DeviceKeyController {
     @Log(title = "系统信息", businessType = BusinessType.UPDATE)
     public BaseResponse checkRegister(@RequestBody @Valid SysPdaKeyEntity sysPdaKeyEntity,
                                       BindingResult bindingResult) {
-
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
@@ -76,7 +74,6 @@ public class DeviceKeyController {
     @PostMapping("/sale/info/deleterKey")
     @Log(title = "系统信息", businessType = BusinessType.DELETE)
     public BaseResponse deleterKey(@RequestBody DeleteRequest deleteRequest) {
-
         sysPdaKeyService.deleteDeviceKey(deleteRequest);
         return ResultVOUtils.success("删除成功");
 

src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java

@@ -48,8 +48,7 @@ public class SysMenuHelpController {
         }
 
         List<SysMenuHelpEntity> list = sysMenuHelpService.MenuHelpList(sysMenuHelpRequest);
-        PageInfo<SysMenuHelpEntity> pageInfo;
+        PageInfo<SysMenuHelpEntity> pageInfo = new PageInfo<>(list);
-        pageInfo = new PageInfo<>(list);
         PageSimpleResponse<SysMenuHelpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(list);

src/main/java/com/glxp/api/controller/system/SysParamConfigController.java

@@ -102,7 +102,6 @@ public class SysParamConfigController {
             systemParamConfigService.updateParentId(sysParamConfigSaveRequest1);
         }
 
-
         //出入库新增单据校验
         if (sysParamConfigSaveRequest.getParamKey().equals("io_transInout_interval")) {
             try {
@@ -207,8 +206,6 @@ public class SysParamConfigController {
                 } else {
                     ReflectUtil.setFieldValue(productRemarkSetEntity, "remarkEnable" + (i + 1), false);
                 }
-
-
             }
         }
         return ResultVOUtils.success(productRemarkSetEntity);

src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java

@@ -78,7 +78,6 @@ public class SysPdfModuleController {
     @Resource
     IBasicBussinessTypeService basicBussinessTypeService;
 
-
     @AuthRuleAnnotation("system/pdf/module/detail")
     @GetMapping("/system/pdf/module/detail")
     public BaseResponse moduleDetail(@Valid FilterPdfTemplateRelevanceRequest systemPDFModuleRequest,
@@ -108,8 +107,6 @@ public class SysPdfModuleController {
             return ResultVOUtils.success(pageSimpleResponse);
         }
         return ResultVOUtils.success(null);
-
-
     }
 
     @AuthRuleAnnotation("system/pdf/module/updateRl")
@@ -125,7 +122,6 @@ public class SysPdfModuleController {
     @GetMapping("/system/pdf/module/pdfModules")
     public BaseResponse pdfModules(@RequestParam(value = "page", defaultValue = "1") Integer page,
                                    @RequestParam(value = "limit", defaultValue = "100") Integer limit) {
-
         List<SystemPDFModuleEntity> systemPDFModuleEntityList = systemPDFModuleService.listPDFModules(page, limit);
         PageInfo<SystemPDFModuleEntity> pageInfo = new PageInfo<>(systemPDFModuleEntityList);
         PageSimpleResponse<SystemPDFModuleSelectResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -154,10 +150,8 @@ public class SysPdfModuleController {
 
         SystemPDFModuleEntity systemPDFModuleEntity = new SystemPDFModuleEntity();
         BeanUtil.copyProperties(sysPdfModuleSaveRequest, systemPDFModuleEntity);
-
         systemPDFModuleEntity.setCreate_time(new Date());
         systemPDFModuleEntity.setUpdate_time(new Date());
-
         boolean b = systemPDFModuleService.insert(systemPDFModuleEntity);
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
@@ -172,7 +166,6 @@ public class SysPdfModuleController {
     public BaseResponse update(@RequestBody SysPdfModuleSaveRequest sysPdfModuleSaveRequest) {
         sysPdfModuleSaveRequest.setUpdate_time(new Date());
         systemPDFModuleService.updateById(sysPdfModuleSaveRequest);
-
         return ResultVOUtils.success("修改成功");
     }
 
@@ -181,7 +174,6 @@ public class SysPdfModuleController {
     @Log(title = "pdf模板", businessType = BusinessType.DELETE)
     public BaseResponse deleteById(@RequestParam("id") Integer id) {
 
-
         boolean b = systemPDFModuleService.deleteById(id);
         if (b)
             return ResultVOUtils.success("删除成功");

src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java

@@ -88,8 +88,6 @@ public class SysPdfTemplateController {
 
         JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
 
-
-
     }
 
     @AuthRuleAnnotation("system/pdf/template/list")

src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java

@@ -25,7 +25,6 @@ public class SysRemindMsgController {
     @AuthRuleAnnotation("")
     @GetMapping("/system/remind/msg/list")
     public BaseResponse list(FilterSysRemindMsgRequest filterSysRemindMsgRequest) {
-
         List<SysRemindMsgEntity> sysRemindMsgEntities = sysRemindMsgService.filterList(filterSysRemindMsgRequest);
         PageInfo<SysRemindMsgEntity> pageInfo = new PageInfo<>(sysRemindMsgEntities);
         return ResultVOUtils.page(pageInfo);

src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java

@@ -32,17 +32,11 @@ public class SystemPDFTemplateRelevanceBizController {
 
     @Resource
     SystemPDFTemplateRelevanceBizService systemPDFTemplateRelevanceBizService;
-
-    @Resource
-    IBasicBussinessTypeService basicBussinessTypeService;
-
     @Resource
     IBasicBusTypeChangeService basicBusTypeChangeService;
 
-
     @PostMapping("/system/pdf/templateRelevanceBiz/getListByModelId")
     public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
-
         FilterBusTypeChangeRequest filterBussinessTypeRequest = new FilterBusTypeChangeRequest();
         filterBussinessTypeRequest.setEnable(true);
         List<BasicBusTypeChangeResponse> bussinessLocalTypeEntities = basicBusTypeChangeService.filterList(filterBussinessTypeRequest);
@@ -55,8 +49,7 @@ public class SystemPDFTemplateRelevanceBizController {
         }
 
         List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceBizEntityList= systemPDFTemplateRelevanceBizService.filterList(filterPdfTemplateRelevanceRequest);
-        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
+        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo = new PageInfo<>(sysPdfTemplateRelevanceBizEntityList);
-        pageInfo = new PageInfo<>(sysPdfTemplateRelevanceBizEntityList);
         PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(sysPdfTemplateRelevanceBizEntityList);
@@ -69,8 +62,4 @@ public class SystemPDFTemplateRelevanceBizController {
         return ResultVOUtils.success("修改成功");
     }
 
-
-
-
-
 }

src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java

@@ -53,8 +53,7 @@ public class SystemPDFTemplateRelevanceCodeController {
         }
 
         List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceCodeEntityList= systemPDFTemplateRelevanceCodeService.filterList(filterPdfTemplateRelevanceRequest);
-        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
+        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo = new PageInfo<>(sysPdfTemplateRelevanceCodeEntityList);
-        pageInfo = new PageInfo<>(sysPdfTemplateRelevanceCodeEntityList);
         PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(sysPdfTemplateRelevanceCodeEntityList);

src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceLabelController.java

@@ -27,8 +27,7 @@ public class SystemPDFTemplateRelevanceLabelController {
     public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
 
         List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceLabelEntityList= systemPDFTemplateRelevanceLabelService.filterList(filterPdfTemplateRelevanceRequest);
-        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
+        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo = new PageInfo<>(sysPdfTemplateRelevanceLabelEntityList);
-        pageInfo = new PageInfo<>(sysPdfTemplateRelevanceLabelEntityList);
         PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(sysPdfTemplateRelevanceLabelEntityList);

src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceStatemenController.java

@@ -27,8 +27,7 @@ public class SystemPDFTemplateRelevanceStatemenController {
     public BaseResponse getListByModelId(@RequestBody FilterPdfTemplateRelevanceRequest filterPdfTemplateRelevanceRequest) {
 
         List<SystemPDFTemplateRelevanceResponse> sysPdfTemplateRelevanceStatemenEntityList= systemPDFTemplateRelevanceStatemenService.filterList(filterPdfTemplateRelevanceRequest);
-        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo;
+        PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo = new PageInfo<>(sysPdfTemplateRelevanceStatemenEntityList);
-        pageInfo = new PageInfo<>(sysPdfTemplateRelevanceStatemenEntityList);
         PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(sysPdfTemplateRelevanceStatemenEntityList);

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

@@ -86,7 +86,6 @@ public class ThirdAliDrugController extends BaseController {
                     nameCodeIn.add(udiInfoEntity.getNameCode());
                 }
             }
-
         }
         thirdAliDrug.setNameCodeIn(nameCodeIn);
         List<ThirdAliDrug> list = new ArrayList<>();

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

@@ -27,8 +27,7 @@ public class ThirdSysApiController {
     @GetMapping("/sys/api/findAll")
     public BaseResponse findAll(FilterSysApiRequest filterSysApiRequest) {
         List<ThirdSysApiEntity> thirdSysApiEntities = thirdSysApiService.findSysApi(filterSysApiRequest);
-        PageInfo<ThirdSysApiEntity> pageInfo;
+        PageInfo<ThirdSysApiEntity> pageInfo = new PageInfo<>(thirdSysApiEntities);
-        pageInfo = new PageInfo<>(thirdSysApiEntities);
         PageSimpleResponse<ThirdSysApiEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thirdSysApiEntities);

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

@@ -53,7 +53,6 @@ public class ThrCorpExportLogController {
     private ThrCorpService thrCorpService;
     @Resource
     ThrCorpsDlService thrCorpsDlService;
-
     @Resource
     private ErpBasicClient erpBasicClient;
     @Resource
@@ -68,8 +67,7 @@ public class ThrCorpExportLogController {
         }
         List<ThrCorpExportLogEntity> thrCorpExportLogEntities
                 = thrCorpExportLogService.filterThrCorpExportLog(filterThrCorpExportLogRequest);
-        PageInfo<ThrCorpExportLogEntity> pageInfo;
+        PageInfo<ThrCorpExportLogEntity> pageInfo = new PageInfo<>(thrCorpExportLogEntities);
-        pageInfo = new PageInfo<>(thrCorpExportLogEntities);
         PageSimpleResponse<ThrCorpExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrCorpExportLogEntities);
@@ -150,7 +148,6 @@ public class ThrCorpExportLogController {
         thrCorpExportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId()));
         thrCorpExportLogEntity.setCreateTime(new Date());
         thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity);
-        //thrCorpsDlService.genExcel(genKey, thrCorpExportRequest);
         //修改为导出json文件
         thrCorpsDlService.genJsonFile(genKey, thrCorpExportRequest);
         return ResultVOUtils.success("后台正在导出生成udi文件，请稍后刷新查看!");

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

@@ -41,8 +41,7 @@ public class ThrCorpImportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrCorpImportLogEntity> thrCorpImportLogEntities = thrCorpImportLogService.filterThrCorpImportLog(filterThrCorpImportLogRequest);
-        PageInfo<ThrCorpImportLogEntity> pageInfo;
+        PageInfo<ThrCorpImportLogEntity> pageInfo = new PageInfo<>(thrCorpImportLogEntities);
-        pageInfo = new PageInfo<>(thrCorpImportLogEntities);
         PageSimpleResponse<ThrCorpImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrCorpImportLogEntities);
@@ -58,8 +57,7 @@ public class ThrCorpImportLogController {
         }
         List<ThrCorpImportDetailEntity> thrCorpImportDetailEntities
                 = thrCorpImportDetailService.filterCorpDetailImport(filterThrCorpImportLogRequest);
-        PageInfo<ThrCorpImportDetailEntity> pageInfo;
+        PageInfo<ThrCorpImportDetailEntity> pageInfo = new PageInfo<>(thrCorpImportDetailEntities);
-        pageInfo = new PageInfo<>(thrCorpImportDetailEntities);
         PageSimpleResponse<ThrCorpImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrCorpImportDetailEntities);

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

@@ -58,8 +58,7 @@ public class ThrCorpsController {
         }
         List<ThrCorpsResponse> thrCorpEntities
                 = thrCorpService.filterThrCorps(filterThrCorpRequest);
-        PageInfo<ThrCorpsResponse> pageInfo;
+        PageInfo<ThrCorpsResponse> pageInfo = new PageInfo<>(thrCorpEntities);
-        pageInfo = new PageInfo<>(thrCorpEntities);
         PageSimpleResponse<ThrCorpsResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrCorpEntities);
@@ -205,12 +204,10 @@ public class ThrCorpsController {
                             erpUnitsResponse.setChecked(false);
                         }
                     }
-
                     return udiDlDeviceResponse;
                 } else {
                     return udiDlDeviceResponse;
                 }
-
             } else {
                 FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
                 BeanUtils.copyProperties(thrUnitMaintainFilterRequest, filterThrCorpRequest);

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

@@ -43,8 +43,7 @@ public class ThrDeptController {
     @GetMapping("spms/thrsys/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterThrDeptRequest filterThrDeptRequest) {
         List<ThrDeptEntity> thrInvWarehouseEntities = thrDeptService.filterThrInvWarehouse(filterThrDeptRequest);
-        PageInfo<ThrDeptEntity> pageInfo;
+        PageInfo<ThrDeptEntity> pageInfo = new PageInfo<>(thrInvWarehouseEntities);
-        pageInfo = new PageInfo<>(thrInvWarehouseEntities);
         PageSimpleResponse<ThrDeptEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvWarehouseEntities);
@@ -156,8 +155,7 @@ public class ThrDeptController {
     public BaseResponse filterInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) {
         filterThrSubInvWarehouseRequest.setStatus(0);
         List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.selectByThrDeptCode(filterThrSubInvWarehouseRequest);
-        PageInfo<ThrInvWarehouseEntity> pageInfo;
+        PageInfo<ThrInvWarehouseEntity> pageInfo = new PageInfo<>(thrInvWarehouseEntities);
-        pageInfo = new PageInfo<>(thrInvWarehouseEntities);
         PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvWarehouseEntities);

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

@@ -34,8 +34,7 @@ public class ThrHslbController {
         }
         List<ThrHslbEntity> thrHslbEntities
                 = thrHslbService.getHslbs(filterThrHslbRequest);
-        PageInfo<ThrHslbEntity> pageInfo;
+        PageInfo<ThrHslbEntity> pageInfo = new PageInfo<>(thrHslbEntities);
-        pageInfo = new PageInfo<>(thrHslbEntities);
         PageSimpleResponse<ThrHslbEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrHslbEntities);

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

@@ -61,8 +61,7 @@ public class ThrInvProductsController {
         }
         List<ThrInvProductsEntity> thrInvProductsEntities
                 = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest);
-        PageInfo<ThrInvProductsEntity> pageInfo;
+        PageInfo<ThrInvProductsEntity> pageInfo = new PageInfo<>(thrInvProductsEntities);
-        pageInfo = new PageInfo<>(thrInvProductsEntities);
         PageSimpleResponse<ThrInvProductsEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvProductsEntities);
@@ -79,9 +78,7 @@ public class ThrInvProductsController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
         List<ThrInvProductResponse> erpOnHandResponses = postThrInvProductsRequest.getDatas();
-
         String genKey = postThrInvProductsRequest.getGenKey();
         if (genKey == null) {
             genKey = CustomUtil.getId();
@@ -113,7 +110,6 @@ public class ThrInvProductsController {
     @PostMapping("/udiwms/thrsys/delInvProducts")
     @Log(title = "第三方服务", businessType = BusinessType.DELETE)
     public BaseResponse delInvProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
-
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }

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

@@ -58,8 +58,7 @@ public class ThrInvProductsExportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrInvProductsExportLogEntity> thrInvProductsExportLogEntities = thrInvProductsExportLogService.filterThrInvProductsExportLog(filterThrProductsExportLogRequest);
-        PageInfo<ThrInvProductsExportLogEntity> pageInfo;
+        PageInfo<ThrInvProductsExportLogEntity> pageInfo = new PageInfo<>(thrInvProductsExportLogEntities);
-        pageInfo = new PageInfo<>(thrInvProductsExportLogEntities);
         PageSimpleResponse<ThrInvProductsExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvProductsExportLogEntities);

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

@@ -42,8 +42,7 @@ public class ThrInvProductsImportLogController {
         }
         List<ThrInvProductsImportLogEntity> thrInvProductsImportLogEntities
                 = thrInvProductsImportLogService.filterThrInvProductsImportLog(filterThrCorpImportLogRequest);
-        PageInfo<ThrInvProductsImportLogEntity> pageInfo;
+        PageInfo<ThrInvProductsImportLogEntity> pageInfo = new PageInfo<>(thrInvProductsImportLogEntities);
-        pageInfo = new PageInfo<>(thrInvProductsImportLogEntities);
         PageSimpleResponse<ThrInvProductsImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvProductsImportLogEntities);
@@ -59,8 +58,7 @@ public class ThrInvProductsImportLogController {
         }
         List<ThrInvProductsImportDetailEntity> thrInvProductsImportDetailEntities
                 = thrInvProductsDetailService.filterInvProductsDetailImport(filterThrCorpImportLogRequest);
-        PageInfo<ThrInvProductsImportDetailEntity> pageInfo;
+        PageInfo<ThrInvProductsImportDetailEntity> pageInfo = new PageInfo<>(thrInvProductsImportDetailEntities);
-        pageInfo = new PageInfo<>(thrInvProductsImportDetailEntities);
         PageSimpleResponse<ThrInvProductsImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvProductsImportDetailEntities);
@@ -86,8 +84,6 @@ public class ThrInvProductsImportLogController {
         }else {
             return ResultVOUtils.error(500, "删除失败，未找到该记录");
         }
-
-
     }
 
 }

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

@@ -44,8 +44,7 @@ public class ThrInvWarehouseController {
         for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
             thrInvWarehouseEntity.setParentName(thrDeptEntity.getName());
         }
-        PageInfo<ThrInvWarehouseEntity> pageInfo;
+        PageInfo<ThrInvWarehouseEntity> pageInfo = new PageInfo<>(thrInvWarehouseEntities);
-        pageInfo = new PageInfo<>(thrInvWarehouseEntities);
         PageSimpleResponse<ThrInvWarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrInvWarehouseEntities);
@@ -127,7 +126,6 @@ public class ThrInvWarehouseController {
         thrDeptEntity.setUpdateTime(new Date());
         thrDeptService.updateInvWarehouse(thrDeptEntity);
 
-
         return ResultVOUtils.success("修改成功!");
     }
 

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

@@ -31,7 +31,6 @@ import java.util.List;
 @RestController
 public class ThrManusController {
 
-
     @Resource
     ThrManufacturerService thrManufacturerService;
     @Resource
@@ -49,8 +48,7 @@ public class ThrManusController {
         }
         List<ThrManufacturerEntity> thrManufacturerEntities
                 = thrManufacturerService.filterThrManu(filterThrCorpRequest);
-        PageInfo<ThrManufacturerEntity> pageInfo;
+        PageInfo<ThrManufacturerEntity> pageInfo = new PageInfo<>(thrManufacturerEntities);
-        pageInfo = new PageInfo<>(thrManufacturerEntities);
         PageSimpleResponse<ThrManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrManufacturerEntities);
@@ -134,8 +132,7 @@ public class ThrManusController {
         }
         List<ThrManufacturerEntity> thrManufacturerEntities
                 = thrManufacturerService.getProductTypes(basicProducstRequest);
-        PageInfo<ThrManufacturerEntity> pageInfo;
+        PageInfo<ThrManufacturerEntity> pageInfo = new PageInfo<ThrManufacturerEntity>(thrManufacturerEntities);
-        pageInfo = new PageInfo<ThrManufacturerEntity>(thrManufacturerEntities);
         PageSimpleResponse<ThrManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrManufacturerEntities);

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

@@ -50,7 +50,6 @@ public class ThrOrderController {
     private SystemParamConfigService systemParamConfigService;
     @Resource
     private IThrBusTypeOriginService iThrBusTypeOriginService;
-
     @Resource
     HttpOkClient httpOkClient;
 
@@ -64,8 +63,7 @@ public class ThrOrderController {
         }
         List<ThrOrderEntity> thrOrderEntities
                 = thrOrderService.filterThrOrder(filterThrOrderRequest);
-        PageInfo<ThrOrderEntity> pageInfo;
+        PageInfo<ThrOrderEntity> pageInfo = new PageInfo<>(thrOrderEntities);
-        pageInfo = new PageInfo<>(thrOrderEntities);
         PageSimpleResponse<ThrOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrOrderEntities);
@@ -82,8 +80,7 @@ public class ThrOrderController {
         }
         List<ThrOrderDetailEntity> thrOrderDetailEntities
                 = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
-        PageInfo<ThrOrderDetailEntity> pageInfo;
+        PageInfo<ThrOrderDetailEntity> pageInfo = new PageInfo<>(thrOrderDetailEntities);
-        pageInfo = new PageInfo<>(thrOrderDetailEntities);
         PageSimpleResponse<ThrOrderDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrOrderDetailEntities);
@@ -363,7 +360,6 @@ public class ThrOrderController {
             return ResultVOUtils.error(500, "第三方业务单据服务未关联");
         }
 
-
         FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
         BeanUtil.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
         filterThrOrderRequest.setPage(filterErpOrderRequest.getPage());
@@ -389,13 +385,11 @@ public class ThrOrderController {
                 erpOrderResponses.add(erpOrderResponse);
             }
         }
-        PageInfo<ThrOrderEntity> pageInfo;
+        PageInfo<ThrOrderEntity> pageInfo = new PageInfo<>(data);
-        pageInfo = new PageInfo<>(data);
         PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(erpOrderResponses);
         return ResultVOUtils.success(pageSimpleResponse);
-
     }
 
 
@@ -436,8 +430,7 @@ public class ThrOrderController {
                 erpOrderResponses.add(erpOrderResponse);
             }
         }
-        PageInfo<ThrOrderEntity> pageInfo;
+        PageInfo<ThrOrderEntity> pageInfo = new PageInfo<>(data);
-        pageInfo = new PageInfo<>(data);
         PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(erpOrderResponses);

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

@@ -44,7 +44,6 @@ public class ThrOrderExportLogController {
     ThrOrderExportLogService thrOrderExportLogService;
     @Resource
     ThrOrdersDlService thrOrdersDlService;
-
     @Resource
     private ThrOrderService thrOrderService;
     @Resource
@@ -61,8 +60,7 @@ public class ThrOrderExportLogController {
         }
         List<ThrOrderExportLogEntity> udiInfoExportLogEntities
                 = thrOrderExportLogService.filterThrOrderExportLog(filterUdiEpLogReques);
-        PageInfo<ThrOrderExportLogEntity> pageInfo;
+        PageInfo<ThrOrderExportLogEntity> pageInfo = new PageInfo<>(udiInfoExportLogEntities);
-        pageInfo = new PageInfo<>(udiInfoExportLogEntities);
         PageSimpleResponse<ThrOrderExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoExportLogEntities);
@@ -113,8 +111,6 @@ public class ThrOrderExportLogController {
         } catch (Exception ex) {
             System.out.println("下载失败！");
         }
-
-
     }
 
     //业务单据导出生成Excel，并创建生成记录
@@ -149,8 +145,6 @@ public class ThrOrderExportLogController {
     @PostMapping("/udiwms/thrOrder/importLog/uploadSmp")
     @Log(title = "业务单据上传SMP", businessType = BusinessType.INSERT)
     public BaseResponse uploadSmp(@RequestBody ThrOrderExportRequest thrOrderExportRequest) {
-
-
         ThrOrderExportLogEntity udiInfoExportLogEntity = new ThrOrderExportLogEntity();
         udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
         String genKey = CustomUtil.getId();
@@ -203,8 +197,7 @@ public class ThrOrderExportLogController {
                     erpOrderResponses.add(erpOrderResponse);
                 }
             }
-            PageInfo<ThrOrderEntity> pageInfo;
+            PageInfo<ThrOrderEntity> pageInfo = new PageInfo<>(data);
-            pageInfo = new PageInfo<>(data);
             PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
             pageSimpleResponse.setTotal(pageInfo.getTotal());
             pageSimpleResponse.setList(erpOrderResponses);

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

@@ -39,7 +39,6 @@ public class ThrOrderImportLogController {
     @Resource
     ThrOrderImportDetailService thrOrderImportDetailService;
 
-
     @GetMapping("/udiwms/thrOrder/importLog/filter")
     public BaseResponse filter(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest,
                                BindingResult bindingResult) {
@@ -49,8 +48,7 @@ public class ThrOrderImportLogController {
         }
         List<ThrOrderImportLogEntity> udiInfoImportLogEntities
                 = thrOrderImportLogService.filterThrOrderImportLog(filterThrCorpImportLogRequest);
-        PageInfo<ThrOrderImportLogEntity> pageInfo;
+        PageInfo<ThrOrderImportLogEntity> pageInfo = new PageInfo<>(udiInfoImportLogEntities);
-        pageInfo = new PageInfo<>(udiInfoImportLogEntities);
         PageSimpleResponse<ThrOrderImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(udiInfoImportLogEntities);
@@ -66,8 +64,7 @@ public class ThrOrderImportLogController {
         }
         List<ThrOrderImportDetailEntity> thrOrderImportDetailEntities
                 = thrOrderImportDetailService.filterOrderImportDetail(filterThrCorpImportLogRequest);
-        PageInfo<ThrOrderImportDetailEntity> pageInfo;
+        PageInfo<ThrOrderImportDetailEntity> pageInfo = new PageInfo<>(thrOrderImportDetailEntities);
-        pageInfo = new PageInfo<>(thrOrderImportDetailEntities);
         PageSimpleResponse<ThrOrderImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrOrderImportDetailEntities);

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

@@ -34,8 +34,7 @@ public class ThrProductTypeCotroller {
         }
         List<ThrProductTypeEntity> thrProductTypeEntityList
                 = thrProductTypeService.getProductTypes(filterThrProductTypeRequest);
-        PageInfo<ThrProductTypeEntity> pageInfo;
+        PageInfo<ThrProductTypeEntity> pageInfo = new PageInfo<ThrProductTypeEntity>(thrProductTypeEntityList);
-        pageInfo = new PageInfo<ThrProductTypeEntity>(thrProductTypeEntityList);
         PageSimpleResponse<ThrProductTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrProductTypeEntityList);

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

@@ -65,8 +65,7 @@ public class ThrProductsAddController {
         filterThrProductsRequest.setThirdSysFk(filterThrProductsRequest.getThirdSys());
         List<ThrProductsAddEntity> thrProductsAddEntities
                 = thrProductsAddService.filterThrProductsRequest(filterThrProductsRequest);
-        PageInfo<ThrProductsAddEntity> pageInfo;
+        PageInfo<ThrProductsAddEntity> pageInfo = new PageInfo<>(thrProductsAddEntities);
-        pageInfo = new PageInfo<>(thrProductsAddEntities);
         PageSimpleResponse<ThrProductsAddEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrProductsAddEntities);
@@ -145,10 +144,7 @@ public class ThrProductsAddController {
         return ResultVOUtils.success(ResultEnum.SUCCESS);
     }
 
-
     @Resource
     UdiRelevanceService udiRelevanceService;
 
-
-
 }

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

@@ -70,12 +70,10 @@ public class ThrProductsAddDiController {
     private ThrProductsService thrProductsService;
     @Resource
     UdiRelevanceService udiRelevanceService;
-
     @Resource
     private AuthAdminService authAdminService;
     @Resource
     private UdiProductService udiProductService;
-
     @Resource
     BasicNewUploadDiService basicNewUploadDiService;
     @Resource

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

@@ -46,13 +46,10 @@ public class ThrProductsController {
 
     @Resource
     ThrProductsService thrProductsService;
-
     @Resource
     ThrSystemDetailService thrSystemDetailService;
-
     @Resource
     private ErpBasicClient erpBasicClient;
-
     @Resource
     private CustomerService customerService;
 
@@ -67,8 +64,7 @@ public class ThrProductsController {
         }
 
         List<ThrProductsResponse> thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest);
-        PageInfo<ThrProductsResponse> pageInfo;
+        PageInfo<ThrProductsResponse> pageInfo = new PageInfo<>(thrCorpEntities);
-        pageInfo = new PageInfo<>(thrCorpEntities);
         PageSimpleResponse<ThrProductsResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrCorpEntities);

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

@@ -63,8 +63,7 @@ public class ThrProductsExportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrProductsExportLogEntity> thrProductsExportLogEntities = thrProductsExportLogService.filterThrProductsExportLog(filterThrProductsExportLogRequest);
-        PageInfo<ThrProductsExportLogEntity> pageInfo;
+        PageInfo<ThrProductsExportLogEntity> pageInfo = new PageInfo<>(thrProductsExportLogEntities);
-        pageInfo = new PageInfo<>(thrProductsExportLogEntities);
         PageSimpleResponse<ThrProductsExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrProductsExportLogEntities);

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

@@ -42,8 +42,7 @@ public class ThrProductsImportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrProductsImportLogEntity> thrProductsImportLogEntities = thrProductsImportLogService.filterThrPorductsImportLog(filterThrProductsImportLogRequest);
-        PageInfo<ThrProductsImportLogEntity> pageInfo;
+        PageInfo<ThrProductsImportLogEntity> pageInfo = new PageInfo<>(thrProductsImportLogEntities);
-        pageInfo = new PageInfo<>(thrProductsImportLogEntities);
         PageSimpleResponse<ThrProductsImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrProductsImportLogEntities);
@@ -58,8 +57,7 @@ public class ThrProductsImportLogController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<ThrProductsImportDetailEntity> thrProductsImportDetailEntities = thrProductsImportDetailService.filterProductsDetailImport(filterThrProductsImportLogRequest);
-        PageInfo<ThrProductsImportDetailEntity> pageInfo;
+        PageInfo<ThrProductsImportDetailEntity> pageInfo = new PageInfo<>(thrProductsImportDetailEntities);
-        pageInfo = new PageInfo<>(thrProductsImportDetailEntities);
         PageSimpleResponse<ThrProductsImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(thrProductsImportDetailEntities);

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

@@ -58,8 +58,7 @@ public class ThrSystemController {
 
         basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest);
 
-        PageInfo<ThrSystemEntity> pageInfo;
+        PageInfo<ThrSystemEntity> pageInfo = new PageInfo<>(basicThirdSysEntities);
-        pageInfo = new PageInfo<>(basicThirdSysEntities);
         PageSimpleResponse<ThrSystemEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicThirdSysEntities);
@@ -121,8 +120,6 @@ public class ThrSystemController {
                 return ResultVOUtils.error(500, "第三方系统名称重复");
             }
 
-            ThrSystemEntity temp = thrSystemService.selectByThirdId(thrSystemEntity.getThirdId());
-
             if (!thrSystemEntity.getEnabled()) {
                 //如操作为禁用第三方系统，则需要判断是否是最后一个启用的第三方系统，需要保留至少启用一个第三方系统
                 FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
@@ -133,7 +130,6 @@ public class ThrSystemController {
                 }
             }
 
-
             if (thrSystemEntity.getMainSys() && !thrSystemEntity.getEnabled()) {
                 return ResultVOUtils.error(500, "主系统必须启用");
             }
@@ -162,8 +158,7 @@ public class ThrSystemController {
         }
         List<ThrSystemDetailEntity> basicThirdSysEntities;
         basicThirdSysEntities = thrSystemDetailService.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest);
-        PageInfo<ThrSystemDetailEntity> pageInfo;
+        PageInfo<ThrSystemDetailEntity> pageInfo = new PageInfo<>(basicThirdSysEntities);
-        pageInfo = new PageInfo<>(basicThirdSysEntities);
         PageSimpleResponse<ThrSystemDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicThirdSysEntities);
@@ -223,8 +218,7 @@ public class ThrSystemController {
         }
         List<ThrSystemBusApiEntity> basicThirdSysEntities = thrSystemBusApiService.filterSysBusApi(filterBasicThirdSysDetailRequest);
 
-        PageInfo<ThrSystemBusApiEntity> pageInfo;
+        PageInfo<ThrSystemBusApiEntity> pageInfo = new PageInfo<>(basicThirdSysEntities);
-        pageInfo = new PageInfo<>(basicThirdSysEntities);
         PageSimpleResponse<ThrSystemBusApiEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(basicThirdSysEntities);

src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java

@@ -41,11 +41,8 @@ public class AuthAdminServiceImpl implements AuthAdminService {
         if (filterAuthUserRequest == null) {
             return Collections.emptyList();
         }
-        if (filterAuthUserRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterAuthUserRequest.getPage() - 1) * filterAuthUserRequest.getLimit();
+        filterAuthUserRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterAuthUserRequest.getLimit());
-        }
-
         return authAdminDao.listAdminPage(filterAuthUserRequest);
     }
 
@@ -153,10 +150,8 @@ public class AuthAdminServiceImpl implements AuthAdminService {
         if (filterNoSelectUserRequest == null) {
             return Collections.emptyList();
         }
-        if (filterNoSelectUserRequest.getPage() != null) {
+        // 分页处理
-            int offset = (filterNoSelectUserRequest.getPage() - 1) * filterNoSelectUserRequest.getLimit();
+        filterNoSelectUserRequest.pageDispose();
-            PageHelper.offsetPage(offset, filterNoSelectUserRequest.getLimit());
-        }
         return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds(), filterNoSelectUserRequest.getDeptId());
     }