Merge branch 'dev' of http://101.36.160.140:21044/province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/hk/controller/PreviewPlaybackController.java

@@ -91,7 +91,7 @@ public class PreviewPlaybackController {
 
     @ApiOperation(value="*云台控制", notes = "云台控制")
     @GetMapping("/previewPlayback/controlling")
-    @SaCheckPermission("/previewPlayback/controlling")
+    //@SaCheckPermission("/previewPlayback/controlling")
     public void controlling(ControllerReqDTO controllerReqDTO) {
         hkService.controlling(controllerReqDTO);
     }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/equipmentOnlineRateAssessment/modular/monitorNvr/mapper/mapping/MonitorNvrMapper.xml

@@ -24,26 +24,23 @@
 
     <select id="selectByNVRDates" resultType="java.util.HashMap" parameterType="java.util.Map" >
         SELECT
-        camera.id camera_id,
-        camera.alias,
-        camera.factory,
-        camera.live,
-        camera.ip camera_ip,
-        camera.username camera_name,
-        camera.password camera_password,
-        camera.port camera_port,
-        camera.type camera_type,
-        nvr.ip nvr_ip,
-        nvr.username nvr_name,
-        nvr. PASSWORD nvr_password,
-        nvr. PORT nvr_port,
-        nvr.factory nvr_factory,
-        camera.channel_number,
-        camera.org_id
+            camera.id camera_id,
+            camera.alias,
+            camera.factory,
+            camera.live,
+            camera.ip camera_ip,
+            camera.username camera_name,
+            camera.password camera_password,
+            camera.port camera_port,
+            camera.type camera_type,
+            camera.channel_number,
+            camera.org_id,
+            camera.camera_index_code cameraIndexCode,
+            s.storehouse_id storehouseId
         FROM
-        depot_qh.monitor_camera camera
-        LEFT JOIN depot_qh.monitor_nvr nvr ON nvr.id = camera.nvr_id
-        WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgId,jdbcType=VARCHAR} AND nvr.org_id = #{orgId,jdbcType=VARCHAR}
+            monitor_camera camera
+                LEFT JOIN camera_storehouse s on s.camera_id = camera.id
+        WHERE camera.isremove = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR}
         group by camera.id
     </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/lawEnforcementSupervision/modular/lesJointInspectionTask/service/impl/LesJointInspectionTaskServiceImpl.java

@@ -42,6 +42,7 @@ import com.unis.lawEnforcementSupervision.modular.lesJointInspectionTask.param.L
 import com.unis.lawEnforcementSupervision.modular.lesJointInspectionTask.service.LesJointInspectionTaskService;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -180,7 +181,10 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
         Integer status = lesJointInspectionTask.getStatus();
         if (1 == status) {
             // 判断驳回在提交
-            if (StringUtils.isEmpty(lesJointInspectionTask.getId())) {
+            QueryWrapper<AuditRequest> wrapper = new QueryWrapper<>();
+            wrapper.lambda().eq(AuditRequest::getRequestId, lesJointInspectionTask.getId());
+            AuditRequest request1 = auditRequestMapper.selectOne(wrapper);
+            if (ObjectUtils.isEmpty(request1)) {
                 // 添加审批(状态 0：待审核；1：已审核；2：驳回)
                 AuditRequest request = this.addAuditRequest(lesJointInspectionTask);
                 // 添加审批流程记录
@@ -205,6 +209,7 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
         request.setAuditStatus(0);
         request.setAuditAdvice(lesJointInspectionTask.getAuditAdvice());
         request.setAuditUserId(lesJointInspectionTask.getAuditUserId());
+        request.setAuditTime(new Date());
         auditRequestMapper.insert(request);
         return request;
     }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/mobileInfo/modular/qcqualityinspection/enums/GradeEnum.java

@@ -0,0 +1,41 @@
+package com.unis.mobileInfo.modular.qcqualityinspection.enums;
+
+public enum GradeEnum {
+
+    FIRST("一等", "1"),
+    TWO("二等", "2"),
+    THREE("三等", "3"),
+    FOUR("四等", "4"),
+    FIVE("五等", "5"),
+    ENDURES("等外", "6");
+
+
+    GradeEnum(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    private String key;
+    private String value;
+
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+
+    //获取对应值
+    public static String getIntValue(String key) {
+        GradeEnum[] values = GradeEnum.values();
+        for (GradeEnum value : values) {
+            if (value.getKey().equals(key)) {
+                return value.getValue();
+            }
+        }
+        return null;
+    }
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/mobileInfo/modular/qcqualityinspection/service/impl/BusinessQcQualityInspectionServiceImpl.java

@@ -31,6 +31,7 @@ import com.unis.basic.info.modular.storehouseInfo.mapper.StorehouseInfoMapper;
 import com.unis.basic.info.modular.unitInfo.mapper.EnumMapper;
 import com.unis.basic.info.modular.warehouseInfo.entity.WarehouseInfo;
 import com.unis.basic.info.modular.warehouseInfo.mapper.WarehouseInfoMapper;
+import com.unis.mobileInfo.modular.qcqualityinspection.enums.GradeEnum;
 import com.unis.mobileInfo.modular.qcqualityinspection.param.*;
 import com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityCityPageVO;
 import com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityOrgPageVO;
@@ -231,9 +232,10 @@ public class BusinessQcQualityInspectionServiceImpl extends ServiceImpl<Business
     public Page<ReserveQualityStoreHousePageVO> reserveQualityStoreHousePage(ReserveQualityStoreHousePageParam pageParam) {
 
         Page<BusinessQcQualityInspection> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        String ypdj = GradeEnum.getIntValue(pageParam.getYpdj());
 
         return businessQcQualityInspectionMapper.selectMyPage(page, pageParam.getBasicStorehouseName(), pageParam.getGrainVarietyName(),
-                pageParam.getReceiveYear(), pageParam.getYpdj(), pageParam.getOrgId());
+                pageParam.getReceiveYear(), ypdj, pageParam.getOrgId());
     }