2023-12-15 模板增加字段：当前模板是否存在维保计划，并且维保计划的“结束时间>=当天”

src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelHeaderData.java

@@ -29,6 +29,16 @@ public class EamPropertiesModelHeaderData extends QueryPage {
     private String itemNo;
     // 项目名称
     private String itemDesc;
+    // 模板是否被用
+    private String isUse;
+
+    public String getIsUse() {
+        return isUse;
+    }
+
+    public void setIsUse(String isUse) {
+        this.isUse = isUse;
+    }
 
     public String getItemNo() {
         return itemNo;

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -556,8 +556,7 @@ public class EamServiceImpl implements EamService {
     //---------------点检模板-------------------
     @Override
     public PageUtils eamPropertiesModelSearch(EamPropertiesModelHeaderData inData){
-        IPage<EamPropertiesModelHeaderData> resultList = this.eamMapper.eamPropertiesModelSearch(
-                new Page<EamPropertiesModelHeaderData>(inData.getPage(), inData.getLimit()), inData);
+        IPage<EamPropertiesModelHeaderData> resultList = this.eamMapper.eamPropertiesModelSearch(new Page<EamPropertiesModelHeaderData>(inData.getPage(), inData.getLimit()), inData);
         return new PageUtils(resultList);
     }
 
@@ -1592,8 +1591,8 @@ public class EamServiceImpl implements EamService {
                     String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
                     try {
                         // 发送短信
-                        int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
-                        //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
+                        //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
+                        int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
                         if (code <= 0) {
                             throw new RuntimeException("短信发送失败!");
                         }
@@ -1742,8 +1741,8 @@ public class EamServiceImpl implements EamService {
                 String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
                 try {
                     // 发送短信
-                    int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
-                    //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
+                    //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
+                    int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
                     if (code <= 0) {
                         throw new RuntimeException("短信发送失败!");
                     }
@@ -2522,8 +2521,8 @@ public class EamServiceImpl implements EamService {
             String content = inData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + inData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
             try {
                 // 发送短信
-                int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
-                //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
+                //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
+                int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
                 if (code <= 0){
                     throw new RuntimeException("短信发送失败!");
                 }

src/main/resources/mapper/pms/EamMapper.xml

@@ -300,7 +300,10 @@
             update_date,
             update_by,
             delflag,
-            version
+            version,
+            CASE WHEN dbo.eam_model_is_use(site, function_type, code_no) > 0 THEN 'Y'
+            else 'N'
+            END as isUse
         FROM eam_properties_model_header
         <where>
             site = #{query.site}
@@ -313,6 +316,12 @@
             <if test="query.active != null and query.active != ''">
                 AND active = #{query.active}
             </if>
+            <if test='query.isUse != null and query.isUse != "" and query.isUse == "Y"'>
+                AND dbo.eam_model_is_use(site, function_type, code_no) > 0
+            </if>
+            <if test='query.isUse != null and query.isUse != "" and query.isUse == "N"'>
+                AND dbo.eam_model_is_use(site, function_type, code_no) = 0
+            </if>
             and function_type = #{query.functionType}
         </where>
     </select>