Update: bug修改

adcbs-check/src/main/java/com/adc/da/system/controller/CheckCertificateInfoDetailController.java

@@ -9,11 +9,13 @@ import com.adc.da.base.web.BaseController;
 import com.adc.da.util.http.ResponseMessage;
 import com.adc.da.util.http.Result;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -115,27 +117,27 @@ public class CheckCertificateInfoDetailController extends BaseController {
      * @auther: 韩飞
      * @date: 2019/11/14
      */
-//    @ApiOperation(value = "|CheckCertificateInfoDetail|修改参数")
-//    @PostMapping("/updateValue")
-//    @Transactional
-//    public ResponseMessage updateRemark(String id, String content) {
-//        if (StringUtils.isEmpty(id)) {
-//            return Result.error("参数缺失");
-//        }
+    @ApiOperation(value = "|CheckCertificateInfoDetail|修改参数")
+    @PostMapping("/updateValue")
+    @Transactional
+    public ResponseMessage updateRemark(String id, String content) {
+        if (StringUtils.isEmpty(id)) {
+            return Result.error("参数缺失");
+        }
 //        if (StringUtils.isEmpty(content)) {
 //            return Result.error("参数缺失");
 //        }
-//        UpdateWrapper wrapper = new UpdateWrapper();
-//        wrapper.set("CONTENT", content);
-//        wrapper.eq("ID", id);
-//        boolean flag = detailService.update(wrapper);
-//        if (flag) {
+        UpdateWrapper wrapper = new UpdateWrapper();
+        wrapper.set("CONTENT", content);
+        wrapper.eq("ID", id);
+        boolean flag = detailService.update(wrapper);
+        if (flag) {
 //            iCheckOperationLogService.operationLog(request.getHeader("userId"), "更新随车文件识别数据");
-//            return Result.success("200", "操作成功", "true");
-//        } else {
-//            return Result.error("操作失败");
-//        }
-//    }
+            return Result.success("200", "操作成功", "true");
+        } else {
+            return Result.error("操作失败");
+        }
+    }
 
     /**
      * 功能描述: 查询核查完成的数据都上传了哪些证书证书

adcbs-check/src/main/java/com/adc/da/system/controller/CheckCertificateMainInfoController.java

@@ -94,7 +94,7 @@ public class CheckCertificateMainInfoController extends BaseController {
     public ResponseMessage delCertificate(String id) {
         int rows = certificateService.delCertificate(id);
         if (rows == 1) {
-            return Result.success("200", "删除成功");
+            return Result.success("200", "删除成功",true);
         } else {
             return Result.error("0", "删除失败");
         }
@@ -187,9 +187,9 @@ public class CheckCertificateMainInfoController extends BaseController {
         if (StringUtils.isEmpty(id)) {
             return Result.error("参数缺失");
         }
-        if (StringUtils.isEmpty(remark)) {
-            return Result.error("参数缺失");
-        }
+//        if (StringUtils.isEmpty(remark)) {
+//            return Result.error("参数缺失");
+//        }
         UpdateWrapper wrapper = new UpdateWrapper();
         wrapper.set("REMARK", remark);
         wrapper.eq("ID", id);

adcbs-check/src/main/java/com/adc/da/system/controller/CheckObdController.java

@@ -114,16 +114,16 @@ public class CheckObdController extends BaseController {
         wrapper.select("DISTINCT ORG_ID");
         baseIds = checkObdOrgService.listObjs(wrapper);
         baseIds.removeAll(userBases);
-        if (baseIds.size()>0) {
-            List<String> baseName = new ArrayList<>();
-            QueryWrapper<TsOrg> orgQueryWrapper = new QueryWrapper<>();
-            orgQueryWrapper.in("ID",baseIds);
-            orgQueryWrapper.select("ORG_NAME");
-            baseName = checkObdOrgService.getBaseNameByOrgIds(baseIds);
-            if (baseName.size()>0) {
-                return Result.error("您不具有" + String.join("、",baseName) +"事业部权限,无法编辑数据");
-            }
-        }
+//        if (baseIds.size()>0) {
+//            List<String> baseName = new ArrayList<>();
+//            QueryWrapper<TsOrg> orgQueryWrapper = new QueryWrapper<>();
+//            orgQueryWrapper.in("ID",baseIds);
+//            orgQueryWrapper.select("ORG_NAME");
+//            baseName = checkObdOrgService.getBaseNameByOrgIds(baseIds);
+//            if (baseName.size()>0) {
+//                return Result.error("您不具有" + String.join("、",baseName) +"事业部权限,无法编辑数据");
+//            }
+//        }
         return Result.success("200","修改成功",checkObdService.updateObd(checkObd));
     }
 
@@ -146,16 +146,16 @@ public class CheckObdController extends BaseController {
         wrapper.select("DISTINCT ORG_ID");
         baseIds = checkObdOrgService.listObjs(wrapper);
         baseIds.removeAll(userBases);
-        if (baseIds.size()>0) {
-            List<String> baseName = new ArrayList<>();
-            QueryWrapper<TsOrg> orgQueryWrapper = new QueryWrapper<>();
-            orgQueryWrapper.in("ID",baseIds);
-            orgQueryWrapper.select("ORG_NAME");
-            baseName = checkObdOrgService.getBaseNameByOrgIds(baseIds);
-            if (baseName.size()>0) {
-                return Result.error("您不具有" + String.join("、",baseName) +"事业部权限,无法删除数据");
-            }
-        }
+//        if (baseIds.size()>0) {
+//            List<String> baseName = new ArrayList<>();
+//            QueryWrapper<TsOrg> orgQueryWrapper = new QueryWrapper<>();
+//            orgQueryWrapper.in("ID",baseIds);
+//            orgQueryWrapper.select("ORG_NAME");
+//            baseName = checkObdOrgService.getBaseNameByOrgIds(baseIds);
+//            if (baseName.size()>0) {
+//                return Result.error("您不具有" + String.join("、",baseName) +"事业部权限,无法删除数据");
+//            }
+//        }
         return Result.success("200","删除成功",checkObdService.deleteObd(id));
     }
 
@@ -202,16 +202,16 @@ public class CheckObdController extends BaseController {
         wrapper.select("DISTINCT ORG_ID");
         baseIds = checkObdOrgService.listObjs(wrapper);
         baseIds.removeAll(userBases);
-        if (baseIds.size()>0) {
-            List<String> baseName = new ArrayList<>();
-            QueryWrapper<TsOrg> orgQueryWrapper = new QueryWrapper<>();
-            orgQueryWrapper.in("ID",baseIds);
-            orgQueryWrapper.select("ORG_NAME");
-            baseName = checkObdOrgService.getBaseNameByOrgIds(baseIds);
-            if (baseName.size()>0) {
-                return Result.error("您不具有" + String.join("、",baseName) +"事业部权限,无法编辑数据");
-            }
-        }
+//        if (baseIds.size()>0) {
+//            List<String> baseName = new ArrayList<>();
+//            QueryWrapper<TsOrg> orgQueryWrapper = new QueryWrapper<>();
+//            orgQueryWrapper.in("ID",baseIds);
+//            orgQueryWrapper.select("ORG_NAME");
+//            baseName = checkObdOrgService.getBaseNameByOrgIds(baseIds);
+//            if (baseName.size()>0) {
+//                return Result.error("您不具有" + String.join("、",baseName) +"事业部权限,无法编辑数据");
+//            }
+//        }
         return Result.success();
     }
 }

adcbs-check/src/main/java/com/adc/da/system/controller/CheckObdDetailController.java

@@ -126,16 +126,16 @@ public class CheckObdDetailController extends BaseController {
         wrapper.select("DISTINCT ORG_ID");
         baseIds = checkObdOrgService.listObjs(wrapper);
         baseIds.removeAll(userBases);
-        if (baseIds.size()>0) {
-            List<String> baseName = new ArrayList<>();
-            QueryWrapper<TsOrg> orgQueryWrapper = new QueryWrapper<>();
-            orgQueryWrapper.in("ID",baseIds);
-            orgQueryWrapper.select("ORG_NAME");
-            baseName = checkObdOrgService.getBaseNameByOrgIds(baseIds);
-            if (baseName.size()>0) {
-                return Result.error("您不具有" + String.join("、",baseName) +"事业部权限,无法删除数据");
-            }
-        }
+//        if (baseIds.size()>0) {
+//            List<String> baseName = new ArrayList<>();
+//            QueryWrapper<TsOrg> orgQueryWrapper = new QueryWrapper<>();
+//            orgQueryWrapper.in("ID",baseIds);
+//            orgQueryWrapper.select("ORG_NAME");
+//            baseName = checkObdOrgService.getBaseNameByOrgIds(baseIds);
+//            if (baseName.size()>0) {
+//                return Result.error("您不具有" + String.join("、",baseName) +"事业部权限,无法删除数据");
+//            }
+//        }
         return Result.success("200","删除成功",checkObdDetailService.deleteDetail(id));
     }
 

adcbs-check/src/main/java/com/adc/da/system/dao/CheckBulletinDataParameterMapper.java

@@ -3,6 +3,7 @@ package com.adc.da.system.dao;
 import com.adc.da.dto.resDTO.CheckMenuManagementResDTO;
 import com.adc.da.system.entity.CheckBulletinDataParameter;
 import com.adc.da.system.entity.CheckCheckMenuManagement;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @author jobob
  * @since 2019-09-26
  */
+@SqlParser(filter = true)
 public interface CheckBulletinDataParameterMapper extends BaseMapper<CheckBulletinDataParameter> {
 
     /**

adcbs-check/src/main/java/com/adc/da/system/service/impl/CheckCertificateMainInfoServiceImpl.java

@@ -9,7 +9,6 @@ import com.adc.da.dto.resDTO.DataCheckDTO;
 import com.adc.da.system.dao.CheckCertificateInfoDetailDao;
 import com.adc.da.system.dao.CheckCertificateMainInfoDao;
 import com.adc.da.system.entity.CdVehicles;
-import com.adc.da.system.entity.CheckBulletinDataParameter;
 import com.adc.da.system.entity.CheckCertificateInfoDetail;
 import com.adc.da.system.entity.CheckCertificateMainInfo;
 import com.adc.da.system.entity.CheckDataCheckResult;
@@ -3764,12 +3763,16 @@ public class CheckCertificateMainInfoServiceImpl
         if(StringUtils.isNotEmpty(vehicleGroup)){
             List<CheckCertificateMainInfo> clcpZk = this.baseMapper.getClcpZk(vehicleGroup);
             if(clcpZk.size()>0) {
-                for (CheckCertificateMainInfo mainInfo : clcpZk) {
-                    mainInfo.setId(mainInfo.getVehicleModel() + mainInfo.getVehicleGroup());
-                    mainInfo.setCheckState("0");
-                    mainInfo.setVersion("1");
-                    this.baseMapper.insert(mainInfo);
+                for (CheckCertificateMainInfo certificate : clcpZk) {
+                    certificate.setId(certificate.getVehicleModel() + certificate.getVehicleGroup());
+                    certificate.setCheckState("0");
+                    certificate.setVersion("1");
+//                    certificate.setOperator("");
+//                    certificate.setRemark("");
+//                    certificate.setCheckDate(null);
+//                    certificate.setBaseId("");
                 }
+                this.saveBatch(clcpZk);
             }
         }
     }

adcbs-check/src/main/resources/mybatis/mapper/system/CheckCertificateMainInfoDao.xml

@@ -13,14 +13,12 @@
         ccmi.REMARK as remark,
         ccmi.CHECK_DATE as checkDate,
         ccmi.CHECK_STATE as checkState,
-        ru.USERNAME as operator,
         cz."产品号"	as productNo,
         cz."中文品牌" as zwpp,
         cz."车辆名称" as vehicleName,
         cz."发布日期" as announcementDate
         FROM
         NERDS.CHECK_CERTIFICATE_MAIN_INFO ccmi
-        LEFT JOIN RETRIEVAL.RET_USERS ru ON ( ru.ID = ccmi.OPERATOR )
         LEFT JOIN RETRIEVAL.CLCP_ZK cz ON (ccmi.VEHICLE_MODEL = cz.车辆型号 and ccmi.VEHICLE_GROUP = cz.批次)
         LEFT JOIN (
         SELECT

adcbs-check/src/main/resources/mybatis/mapper/system/CheckEnterpriseDataDao.xml

@@ -64,7 +64,7 @@
             </if>
         </where>
         <if test="vehicleList.orderBy != null and vehicleList.orderBy != ''">
-            order by t.id,${vehicleList.orderBy} ${vehicleList.order},t.VEHICLE_GROUP desc,t.VEHICLE_MODEL desc,t.PRODUCT_NO desc
+            order by ${vehicleList.orderBy} ${vehicleList.order},t.VEHICLE_GROUP desc,t.VEHICLE_MODEL desc,t.PRODUCT_NO desc
         </if>
         <if test="vehicleList.orderBy == null or vehicleList.orderBy == ''">
             order by t.id ,t.VEHICLE_GROUP desc,t.VEHICLE_MODEL desc,t.PRODUCT_NO desc