查询等相关bug修改

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

@@ -95,12 +95,12 @@ public class userPersonController {
 
     @ApiOperation(value = "新增本企业负责人信息", response = BaseResponse.class)
     @PostMapping("/sup/company/person/addPerSon")
-    public BaseResponse addPerSon(@RequestBody UserPersonFilterRequest userPersonFilterRequest ,BindingResult bindingResult  ){
+    public BaseResponse addPerSon(@RequestBody UserPersonFilterRequest userPersonFilterRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         UserPersonEntity userPerson = new UserPersonEntity();
-        BeanUtils.copyProperties(userPersonFilterRequest,userPerson);
+        BeanUtils.copyProperties(userPersonFilterRequest, userPerson);
         userPerson.setPassword(userPersonFilterRequest.getCheckPassword());
         //userPerson.setCompanyId(Long.valueOf(userPersonFilterRequest.getCompanyId()));
 //        userPerson.setId(Long.valueOf(Long.parseLong(userPersonFilterRequest.getCompanyId())));
@@ -121,5 +121,4 @@ public class userPersonController {
     }
 
 
-
 }

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

@@ -51,7 +51,7 @@ public class UserComanyController extends BaseController {
 
 
     //    关键字搜索
-    @ApiOperation(value = "查询用户企业信息(关键字搜索)",response = UserCompanyEntity.class)
+    @ApiOperation(value = "查询用户企业信息(关键字搜索)", response = UserCompanyEntity.class)
     @AuthRuleAnnotation("udi/auth/user/comapny/search")
     @GetMapping("udi/auth/user/comapny/search")
     public BaseResponse search(FilterUserComapanyRequest filterUserComapanyRequest) {
@@ -60,14 +60,14 @@ public class UserComanyController extends BaseController {
             filterUserComapanyRequest.setSearchKey("");
         }
         QueryWrapper<UserCompanyEntity> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(filterUserComapanyRequest.getCompanyName()) && !"null".equals(filterUserComapanyRequest.getCompanyName())){
+        if (StringUtils.isNotBlank(filterUserComapanyRequest.getCompanyName()) && !"null".equals(filterUserComapanyRequest.getCompanyName())) {
             queryWrapper.like("companyName", filterUserComapanyRequest.getSearchKey());
         }
-        if (StringUtils.isNotBlank(filterUserComapanyRequest.getCreditNum()) && !"null".equals(filterUserComapanyRequest.getCreditNum())){
+        if (StringUtils.isNotBlank(filterUserComapanyRequest.getCreditNum()) && !"null".equals(filterUserComapanyRequest.getCreditNum())) {
-            queryWrapper.eq("creditNum",filterUserComapanyRequest.getCreditNum());
+            queryWrapper.eq("creditNum", filterUserComapanyRequest.getCreditNum());
         }
-        if (StringUtils.isNotBlank(filterUserComapanyRequest.getBussinessStatus()) && !"null".equals(filterUserComapanyRequest.getBussinessStatus())){
+        if (StringUtils.isNotBlank(filterUserComapanyRequest.getBussinessStatus()) && !"null".equals(filterUserComapanyRequest.getBussinessStatus())) {
-            queryWrapper.eq("bussinessStatus",filterUserComapanyRequest.getBussinessStatus());
+            queryWrapper.eq("bussinessStatus", filterUserComapanyRequest.getBussinessStatus());
         }
         List<UserCompanyEntity> userCompanyEntities = userCompanyService.list(
                 queryWrapper.eq("checkStatus", 1)
@@ -83,7 +83,7 @@ public class UserComanyController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @ApiOperation(value = "查询用户企业信息",response = UserCompanyEntity.class)
+    @ApiOperation(value = "查询用户企业信息", response = UserCompanyEntity.class)
     @AuthRuleAnnotation("")
     @GetMapping("udi/auth/user/comapny/filterCompanyName")
     public BaseResponse filterCompanyName(FilterUserComapanyRequest filterUserComapanyRequest) {
@@ -96,7 +96,7 @@ public class UserComanyController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @ApiOperation(value = "查询注册企业信息",response = UserCompanyEntity.class)
+    @ApiOperation(value = "查询注册企业信息", response = UserCompanyEntity.class)
     @AuthRuleAnnotation("")
     @GetMapping("udi/auth/user/comapny/filterRegCompany")
     public BaseResponse filterRegCompanyInfo(FilterUserComapanyRequest filterUserComapanyRequest) {
@@ -120,7 +120,7 @@ public class UserComanyController extends BaseController {
      * @param filterUserComapanyRequest
      * @return
      */
-    @ApiOperation(value = "查询企业账号列表，包含客户端在线状态",response = UserCompanyResponse.class)
+    @ApiOperation(value = "查询企业账号列表，包含客户端在线状态", response = UserCompanyResponse.class)
     @AuthRuleAnnotation("")
     @GetMapping("udi/auth/user/comapny/status/filter")
     public BaseResponse filterCompanyStaus(FilterUserComapanyRequest filterUserComapanyRequest) {

src/main/java/com/glxp/api/service/sup/impl/UserCompanyServiceImpl.java

@@ -16,7 +16,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Service
-public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserCompanyEntity> implements UserCompanyService{
+public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserCompanyEntity> implements UserCompanyService {
 
     @Resource
     UserCompanyMapper userCompanyMapper;
@@ -28,7 +28,7 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
 
     @Override
     public boolean update(UserCompanyEntity userCompany) {
-        return userCompanyMapper.updateById(userCompany)>0;
+        return userCompanyMapper.updateById(userCompany) > 0;
     }
 
     @Override
@@ -36,8 +36,11 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
         if (filterUserComapanyRequest == null) {
             return Collections.emptyList();
         }
+        if (filterUserComapanyRequest.getPage() != null) {
             int offset = (filterUserComapanyRequest.getPage() - 1) * filterUserComapanyRequest.getLimit();
             PageHelper.offsetPage(offset, filterUserComapanyRequest.getLimit());
+        }
+
         List<UserCompanyEntity> data = userCompanyMapper.filterCompanyName(filterUserComapanyRequest);
         return data;
     }

src/main/java/com/glxp/api/service/trace/TraceProductDetailService.java

@@ -19,7 +19,7 @@ public class TraceProductDetailService extends ServiceImpl<TraceRecordDetailMapp
     public TraceProductDetailEntity findUniqueByCode(Integer traceType, String udiCode) {
         List<TraceProductDetailEntity> traceRecordDetailEntities = traceRecordDetailMapper.selectList(new QueryWrapper<TraceProductDetailEntity>()
                 .eq("traceType", traceType)
-                .eq("udiCode", udiCode).last("limit 1"));
+                .likeLeft("udiCode", udiCode).last("limit 1"));
         if (CollUtil.isNotEmpty(traceRecordDetailEntities))
             return traceRecordDetailEntities.get(0);
         else return null;

src/main/java/com/glxp/api/service/trace/UdiTraceService.java

@@ -189,7 +189,7 @@ public class UdiTraceService {
             pushMq(inoutTaskNotity, companyId);
         }
 
-        if (traceProductDetailEntity.getStatus() == 2) { //出入库订单未处理完成
+//        if (traceProductDetailEntity.getStatus() == 2) { //出入库订单未处理完成
             //列出需要查询推送企业
             List<TraceOrderEntity> traceOrderEntities = traceOrderService.findByProductIdFk(traceProductDetailEntity.getId());
             if (CollUtil.isNotEmpty(traceOrderEntities)) {
@@ -207,16 +207,16 @@ public class UdiTraceService {
                     UserCompanyEntity userCompanyEntity = userCompanyService.getOne(new QueryWrapper<UserCompanyEntity>().eq("creditNum", certNum));
                     TraceTaskNoticeEntity taskNoticeEntity = traceTaskNoticeService.findTask(1, traceProductDetailEntity.getId(), userCompanyEntity.getId());
                     if (taskNoticeEntity == null) {
-                        taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, companyId);
+                        taskNoticeEntity = createTraceNotice(1, traceProductDetailEntity, userCompanyEntity.getId());
                         pushDelayExpireTask(taskNoticeEntity);
-                        pushMq(taskNoticeEntity, companyId);
+                        pushMq(taskNoticeEntity, userCompanyEntity.getId());
                     } else if (taskNoticeEntity.getStatus() == 4) {
                         //任务超时未处理，重新推送消息
-                        pushMq(taskNoticeEntity, companyId);
+                        pushMq(taskNoticeEntity, userCompanyEntity.getId());
-                    }
                     }
                 }
             }
+//        }
     }
 
 

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: pro
   jmx:
     enabled: false
   servlet:

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

@@ -90,6 +90,9 @@
                     DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
                 ]]>
             </if>
+            <if test="unionCode != '' and unionCode != null">
+                AND nameCode LIKE concat(#{unionCode}, '%')
+            </if>
             <if test="unionFilterStr != '' and unionFilterStr != null">
                 or p.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
                 or p.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')