Merge branch 'developer' into develop_ccs

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/TemplateCellWriteHandlerDate.java

@@ -67,7 +67,7 @@ public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
 	            // 设置下拉单元格的首行 末行 首列 末列
 	            CellRangeAddressList rangeList = new CellRangeAddressList(1, 65536, k, k);
 	            // 如果下拉值总数大于100，则使用一个新sheet存储，避免生成的导入模板下拉值获取不到
-	            if (v.length > LIMIT_NUMBER) {
+	            if (v.length > 0) {
 	                //定义sheet的名称
 	                //1.创建一个隐藏的sheet 名称为 hidden + k
 	                String sheetName = "hidden" + k;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/IndustryController.java

@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import java.util.List;
 
+
 @RestController
 @Api(tags = "行业分类Industry")
 @RequestMapping(value = "/industry")
@@ -19,8 +19,8 @@ public class IndustryController {
     @Autowired
     IIndustryService industryService;
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/list")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     public List<Industry> listAll() {
         return industryService.list();
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -1545,7 +1545,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                             alertSubmittedObjectListSub.add(alertSubmittedObjectSub);
                           //  alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectListSub);
                             // 调用短信发送接口
-                            alertCalledAction.sendAlertCalleCmd(sCode, mobile, smsParams);
+                            alertCalledAction.sendAlertCalleCmd(smsCode, mobile, smsParams);
                             Map<String, String> besidesMap = new HashMap<String, String>();
                             besidesMap.put("responseLevelString", responseLevelString);
                             besidesMap.put("alterId", alertCalledId);
@@ -1568,7 +1568,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                         userList.add(i.get("amosId").toString());
                     }
                 });
-                smsParams.put("resourcesNum", resourcesNumStr.substring(resourcesNumStr.length() - 2));
+                smsParams.put("resourcesNum", resourcesNumStr);
                 // 短信报送对象
                 // alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
                 // 发送任务消息

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan.xml

@@ -118,6 +118,7 @@
 		p_route b
 		WHERE
 		a.route_Id = b.id and a.is_delete = 0
+		and (a.status > 0 or a.maker_user_id = #{loginUserId})
 		<if test="planName!=null">and a.name like concat(concat("%",#{planName}),"%")</if>
 		<if test="checkTypeId!=null and checkTypeId != '' ">and a.check_type_id = #{checkTypeId}</if>
 		<if test="leadPerson!=null and leadPerson != '' ">and a.lead_people_ids = #{leadPerson}</if>
@@ -167,6 +168,7 @@
 		p_route b
 		WHERE
 		a.route_Id = b.id and a.is_delete = 0
+		and (a.status > 0 or a.maker_user_id = #{loginUserId})
 		<if test="planName!=null"> and a.name like concat(concat("%",#{planName}),"%")</if>
 		<if test="checkTypeId!=null and checkTypeId != '' "> and a.check_type_id = #{checkTypeId}</if>
 		<if test="leadPerson!=null and leadPerson != '' "> and a.lead_people_ids = #{leadPerson}</if>