Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/CheckResultMapper.xml

@@ -3,7 +3,13 @@
 <mapper namespace="com.yeejoin.amos.boot.module.tdc.api.mapper.CheckResultMapper">
     <select id="selectResult" resultType="com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto">
         select check_date, case when check_type="1" then  '全站校验' else `model_name` end as `name`
-        from `tdc_check_result` where amos_org_code=#{code} GROUP BY batch_no
+        from `tdc_check_result`
+         <where>
+             <if test="code != '' and code != null">
+                and amos_org_code=#{code}
+             </if>
+         </where>
+        GROUP BY batch_no
     </select>
 
     <select id="selectTotal" resultType="com.yeejoin.amos.boot.module.tdc.api.dto.CheckResultDto">

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckModelImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckModel;
+import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckResult;
 import com.yeejoin.amos.boot.module.tdc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckModelMapper;
@@ -20,10 +21,14 @@ import com.yeejoin.amos.boot.module.tdc.biz.action.model.IdxProjectModel;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
 
+
 /**
  * @author xxz
  */
@@ -42,10 +47,17 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
     @Override
     public IPage<CheckModel> selectByOrgCode(int current, int size, String amosOrgCode) {
         Page page = new Page(current,size);
-        LambdaQueryWrapper<CheckModel> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CheckModel::getAmosOrgCode, amosOrgCode);
+
+        if(ValidationUtil.isEmpty(amosOrgCode)){
+            return this.page(page);
+
+        }else{
+            LambdaQueryWrapper<CheckModel> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(CheckModel::getAmosOrgCode, amosOrgCode);
 //        return baseMapper.selectList(wrapper);
-        return this.page(page,wrapper);
+            return this.page(page,wrapper);
+        }
+
     }
 
     @Override

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckResultImpl.java

@@ -35,6 +35,7 @@ import org.codehaus.jettison.json.JSONString;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
@@ -65,10 +66,12 @@ public class CheckResultImpl extends ServiceImpl<CheckResultMapper, CheckResult>
     @Override
     public IPage<CheckResultDto> selectResult(int current,int size,String code) {
         Page page = new Page(current,size);
-
         return checkResultMapper.selectResult(page,code);
+
+//        return checkResultMapper.selectResult(page,code);
     }
 
+
     @Override
     public List<CheckResult> selectCheckResult(String modelId,String batchNo) {
         LambdaQueryWrapper<CheckResult> wrapper = new LambdaQueryWrapper<>();