Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/entity/OtherInfo.java

@@ -64,5 +64,6 @@ public class OtherInfo extends AbstractEquipBaseEntity {
     @TableField(value ="\"SUPERVISORY_CODE\"")
     private String supervisoryCode;
 
-
+    @TableField(value ="\"STATUS\"")
+    private String status;
 }

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAppService.java

@@ -19,7 +19,6 @@ import com.yeejoin.amos.boot.module.app.api.dto.*;
 import com.yeejoin.amos.boot.module.app.api.entity.*;
 import com.yeejoin.amos.boot.module.app.api.enums.EquipmentCategoryEnum;
 import com.yeejoin.amos.boot.module.app.api.enums.EquipmentClassifityEnum;
-import com.yeejoin.amos.boot.module.app.api.mapper.AppCommonMapper;
 import com.yeejoin.amos.boot.module.app.api.mapper.CategoryOtherInfoMapper;
 import com.yeejoin.amos.boot.module.app.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.app.biz.utils.HttpUtils;
@@ -254,7 +253,7 @@ public class TzsAppService {
         otherJsonObject.put("tabValue", otherList);
         jsonArray.add(otherJsonObject);
         map.put("tab", jsonArray);
-
+        map.put("color", this.getQrCodeColor(record));
         return map;
     }
 
@@ -409,9 +408,19 @@ public class TzsAppService {
             jsonArray.add(constructionJsonObject);
             map.put("tab", jsonArray);
         }
+        map.put("color", this.getQrCodeColor(record));
         return map;
     }
 
+    private String getQrCodeColor(String record) {
+        // 二维码颜色赋值逻辑
+        OtherInfo otherInfo = otherInfoService.getOne(new LambdaQueryWrapper<OtherInfo>().eq(OtherInfo::getRecord, record));
+        if (otherInfo != null) {
+            return "0".equals(otherInfo.getStatus()) ? "#ff0000" : "#00ff00";
+        }
+        return "#f2f2f2";
+    }
+
     public void getGroupList(HashMap putMap, String record, Class entity, Class dto, BaseService service, List list, boolean isOne, List<DataDictionary> dictionaryList, List<EquipmentCategory> equipmentCategories) {
         TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), entity);
         QueryWrapper wrapper = new QueryWrapper();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -298,10 +298,10 @@
             and n.notice_status != '6610'
             and n.notice_status != '6615'
             <if test="param.beginDate != null">
-                and date_ge(CAST(n.notice_date as date), #{param.beginDate})
+                and CAST(n.notice_date as date) <![CDATA[>=]]> #{param.beginDate}
             </if>
             <if test="param.endDate != null">
-                and date_le(CAST(n.notice_date as date), #{param.endDate})
+                and CAST(n.notice_date as date) <![CDATA[<=]]> #{param.endDate}
             </if>
             <if test="param.receiveOrgCode != null">
                 and n.receive_company_org_code like concat(#{param.receiveOrgCode}, '%')
@@ -544,10 +544,10 @@
                 and n.status != '使用单位待提交'
                 and n.status != '使用单位已撤回'
                 <if test="param.beginDate != null">
-                    and date_ge(CAST(n.create_date as date), #{param.beginDate})
+                    and CAST(n.create_date as date) <![CDATA[>=]]> #{param.beginDate}
                 </if>
                 <if test="param.endDate != null">
-                    and date_le(CAST(n.create_date as date), #{param.endDate})
+                    and CAST(n.create_date as date) <![CDATA[<=]]> #{param.endDate}
                 </if>
                 <if test="param.receiveOrgCode != null">
                     and n.receive_company_org_code like concat(#{param.receiveOrgCode}, '%')
@@ -603,10 +603,10 @@
         and n.is_delete = 0
         and (n.manage_type is null or n.manage_type = '' or n.manage_type = 'set')
         <if test="param.beginDate != null">
-            and date_ge(CAST(n.reg_date as date), #{param.beginDate})
+            and CAST(n.reg_date as date) <![CDATA[>=]]> #{param.beginDate}
         </if>
         <if test="param.endDate != null">
-            and date_le(CAST(n.reg_date as date), #{param.endDate})
+            and CAST(n.reg_date as date) <![CDATA[<=]]> #{param.endDate}
         </if>
         <if test="param.receiveOrgCode != null">
             and n.receive_company_org_code like concat(#{param.receiveOrgCode}, '%')
@@ -653,10 +653,10 @@
         and n.audit_status  != '使用单位待提交'
         and n.audit_status  != '使用单位已撤回'
         <if test="param.beginDate != null">
-            and date_ge(CAST(n.reg_date as date), #{param.beginDate})
+            and CAST(n.reg_date as date) <![CDATA[>=]]> #{param.beginDate}
         </if>
         <if test="param.endDate != null">
-            and date_le(CAST(n.reg_date as date), #{param.endDate})
+            and CAST(n.reg_date as date) <![CDATA[<=]]> #{param.endDate}
         </if>
         <if test="param.receiveOrgCode != null">
             and n.receive_company_org_code like concat(#{param.receiveOrgCode}, '%')
@@ -702,10 +702,10 @@
         and n.audit_status  != '使用单位待提交'
         and n.audit_status  != '使用单位已撤回'
         <if test="param.beginDate != null">
-            and date_ge(CAST(n.reg_date as date), #{param.beginDate})
+            and CAST(n.reg_date as date) <![CDATA[>=]]> #{param.beginDate}
         </if>
         <if test="param.endDate != null">
-            and date_le(CAST(n.reg_date as date), #{param.endDate})
+            and CAST(n.reg_date as date) <![CDATA[<=]]> #{param.endDate}
         </if>
         <if test="param.receiveOrgCode != null">
             and n.receive_company_org_code like concat(#{param.receiveOrgCode}, '%')
@@ -752,10 +752,10 @@
         and n.status  != '使用单位待提交'
         and n.status  != '使用单位已撤回'
         <if test="param.beginDate != null">
-            and date_ge(CAST(n.apply_date as date), #{param.beginDate})
+            and CAST(n.apply_date as date) <![CDATA[>=]]> #{param.beginDate}
         </if>
         <if test="param.endDate != null">
-            and date_le(CAST(n.apply_date as date), #{param.endDate})
+            and CAST(n.apply_date as date) <![CDATA[<=]]> #{param.endDate}
         </if>
         <if test="param.receiveOrgCode != null">
             and n.receive_company_org_code like concat(#{param.receiveOrgCode}, '%')