存量用地添加短信通知

src/main/java/platform/common/Constant.java

@@ -832,6 +832,10 @@ public final class Constant {
     public static final class SMS_TemplateCode {
         //存量用地街道确认通知企业
         public static String STOCKLAND_CONFIRM_AND_NOTIFY = "SMS_136165056";
+        //存量用地街道通过通知下级审批
+        public static String STOCKLAND_LOCAL_AUDIT = "SMS_219620882";
+        //存量用地进入合规性审查汇总阶段通知下级审批
+        public static String STOCKLAND_HGXSCTG = "SMS_219620883";
         //政府帮企业新建账号
         public static String NEW_COMPANY_USER = "SMS_136170623";
         //企业注册账号，成功

src/main/java/platform/modules/company/service/StockLandApproveService.java

@@ -1,6 +1,7 @@
 
 package platform.modules.company.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsResponse;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
@@ -22,6 +23,7 @@ import platform.common.exception.BaseException;
 import platform.common.util.AlibabaSMSUtil;
 import platform.common.util.DateUtil;
 import platform.common.util.ShiroUtils;
+import platform.modules.api.dto.CompanyInfoDto;
 import platform.modules.build.entity.BuildFloor;
 import platform.modules.build.entity.Company;
 import platform.modules.build.entity.CompanyContact;
@@ -44,7 +46,9 @@ import platform.modules.company.entity.StockLand;
 import platform.modules.company.entity.StockLandOutPark;
 import platform.modules.government.dao.AttachmentDao;
 import platform.modules.government.entity.FileDown;
+import platform.modules.government.entity.Street;
 import platform.modules.government.entity.User;
+import platform.modules.government.service.StreetService;
 import platform.modules.government.service.UserService;
 import platform.modules.home.request.FindRequest;
 import platform.modules.sys.dao.UserGroupDao;
@@ -135,6 +139,9 @@ public class StockLandApproveService extends BaseService<StockLand> {
     @Autowired
     private StockLandOutParkService stockLandOutParkService;
 
+    @Autowired
+    private StreetService streetService;
+
     /**
      * 审核列表数据
      *
@@ -272,7 +279,7 @@ public class StockLandApproveService extends BaseService<StockLand> {
 
         StockLand stockland = stockLandService.findLandApplyById(approval.getApply_id());
         Company company = companyService.findCompanyInfo(stockland.getCompany_id());
-        if(stockland.getContract_id()!=null){
+        if (stockland.getContract_id() != null) {
             contractService.batchDeleteByContractId(stockland.getContract_id());
         }
 
@@ -601,6 +608,34 @@ public class StockLandApproveService extends BaseService<StockLand> {
                     waitToDoService.newTODO("存量用地审核", "/areaManager/approval?id=" + apply.getId(), Constant.WaitToDo_OperType.AUDIT, apply.getId(),
                             Constant.DictionaryType.STOCKLAND, apply.getApply_no(), handler, Constant.WaitToDo_IsSerial.IS_SERIAL);
                 }
+
+                if (StringUtils.isNotBlank(nextChecker)) {
+                    try {
+                        StockLand stockLand = stockLandService.findById(apply.getId());
+                        Integer userid = stockLand.getCreate_by();
+                        CompanyInfoDto company = companyService.findByUserId(userid);
+                        Street street = streetService.findById(ShiroUtils.getStreetId());
+
+                        Map<String, String> params = new HashMap<>();
+                        params.put("company_name", company.getCompany_name());
+                        params.put("street_name", street.getName());
+
+                        String tempCode = Constant.SMS_TemplateCode.STOCKLAND_LOCAL_AUDIT;
+
+                        for (String checkerId : nextChecker.split(",")) {
+                            User checker = userService.findById(Integer.valueOf(checkerId));
+                            AlibabaSMSUtil.sendSMS(
+                                    checker.getPhone(),
+                                    tempCode,
+                                    Constant.SINGNAMW,
+                                    JSONObject.toJSONString(params)
+                            );
+                        }
+                    } catch (ClientException | InterruptedException e) {
+//                        throw new BaseException("短信接口异常！发送短信失败!");
+                    }
+                }
+
 				/*String [] nextCheckerArr = nextChecker.split(",");
 				if(null != nextCheckerArr && nextCheckerArr.length > 0){
 					//“街道合规性审核小组”最后一个人审核

src/main/java/platform/modules/company/service/StockLandService.java

@@ -1,6 +1,8 @@
 
 package platform.modules.company.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.exceptions.ClientException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -17,6 +19,7 @@ import platform.common.base.service.BaseService;
 import platform.common.base.service.DictionaryItemService;
 import platform.common.exception.BaseException;
 import platform.common.util.*;
+import platform.modules.api.dto.CompanyInfoDto;
 import platform.modules.build.entity.Company;
 import platform.modules.build.service.CompanyService;
 import platform.modules.company.dao.StockLandDao;
@@ -30,6 +33,7 @@ import platform.modules.government.dto.GovStatisticsDto;
 import platform.modules.government.dto.SearchCondition;
 import platform.modules.government.entity.Attachment;
 import platform.modules.government.entity.FileDown;
+import platform.modules.government.entity.Street;
 import platform.modules.government.entity.User;
 import platform.modules.government.service.AttachmentService;
 import platform.modules.government.service.StreetService;
@@ -814,7 +818,29 @@ public class StockLandService extends BaseService<StockLand> {
 					String handler = userIdInThisGroup;
 					waitToDoService.newTODO("存量用地审核", "/areaManager/approval?id=" + stockLand.getId(), Constant.WaitToDo_OperType.AUDIT, stockLand.getId(),
 							Constant.DictionaryType.STOCKLAND,stockLand.getApply_no(), handler , Constant.WaitToDo_IsSerial.IS_PARALLEL);
-					
+
+					try {
+						StockLand stockLandEntity = this.findById(stockLand.getId());
+						Integer userid = stockLandEntity.getCreate_by();
+						CompanyInfoDto company = companyService.findByUserId(userid);
+
+						Map<String, String> params = new HashMap<>();
+						params.put("company_name", company.getCompany_name());
+
+						String tempCode = Constant.SMS_TemplateCode.STOCKLAND_HGXSCTG;
+
+						for (String checkerId : handler.split(",")) {
+							User checker = userService.findById(Integer.valueOf(checkerId));
+							AlibabaSMSUtil.sendSMS(
+									checker.getPhone(),
+									tempCode,
+									Constant.SINGNAMW,
+									JSONObject.toJSONString(params)
+							);
+						}
+					} catch (ClientException | InterruptedException e) {
+//                        throw new BaseException("短信接口异常！发送短信失败!");
+					}
 				}
 				
 				/* -2018-05-28 改变- 同一级审核需要都审核完成

src/main/resources/mapper/company/ProjectApplicationDao.xml

@@ -55,7 +55,7 @@
         </if>
         <if test="searchCondition.isPendingAudit == 0"><!-- 为0 ，取已审核数据 ,街道审核过的数据-->
             and a.id in (
-            SELECT DISTINCT APPLY_ID FROM Z_APPROVAL
+            SELECT DISTINCT APPLY_ID FROM z_approval
             WHERE checker = #{searchCondition.checker_id}
             and type = #{searchCondition.approveType}
             )

src/main/resources/mapper/company/StockLandDao.xml

@@ -103,7 +103,7 @@
 		</if>
 		<if test="searchCondition.isPendingAudit == 1"><!-- 为1 ，取待审核数据-->
 			and a.id in (
-				SELECT DISTINCT APPLY_ID FROM Z_APPROVAL WHERE (NEXTCHECKER = #{approvalCondition.nextchecker}
+				SELECT DISTINCT APPLY_ID FROM z_approval WHERE (NEXTCHECKER = #{approvalCondition.nextchecker}
 				or NEXTCHECKER LIKE CONCAT(#{approvalCondition.nextchecker}, ',%')
 				or NEXTCHECKER LIKE CONCAT(CONCAT('%,',#{approvalCondition.nextchecker}), ',%'))
 				and (
@@ -122,7 +122,7 @@
 		</if>
 		<if test="searchCondition.isPendingAudit == 0"><!-- 为0 ，取已审核数据-->
 			and a.id not in (
-				SELECT DISTINCT APPLY_ID FROM Z_APPROVAL WHERE (NEXTCHECKER = #{approvalCondition.nextchecker}
+				SELECT DISTINCT APPLY_ID FROM z_approval WHERE (NEXTCHECKER = #{approvalCondition.nextchecker}
 				or NEXTCHECKER LIKE CONCAT(#{approvalCondition.nextchecker}, ',%')
 				or NEXTCHECKER LIKE CONCAT(CONCAT('%,',#{approvalCondition.nextchecker}), ',%'))
 				and (