bug修复

src/main/java/platform/modules/build/service/CompanyService.java

@@ -561,7 +561,18 @@ public class CompanyService extends BaseService<Company> {
             String nick_name = user.getNick_name();
             String company_name = user.getCompany_name();
             templateParam = "{\"nick_name\":\"" + nick_name + "\",\"company_name\":\"" + company_name + "\"}";
-//            AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.COMPANY_USER_REGISTER_PASSED, Constant.SINGNAMW, templateParam);
+
+            try {
+                AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.COMPANY_USER_REGISTER_PASSED, Constant.SINGNAMW, templateParam);
+            } catch (ClientException e) {
+                logger.error("发送阿里巴巴sms错误(ClientException)：{}", e.getMessage());
+                e.printStackTrace();
+                throw new RuntimeException("发送阿里巴巴sms错误(ClientException)：" + e.getMessage());
+            } catch (InterruptedException e) {
+                logger.error("发送阿里巴巴sms错误(InterruptedException)：{}", e.getMessage());
+                e.printStackTrace();
+                throw new RuntimeException("发送阿里巴巴sms错误(InterruptedException)：" + e.getMessage());
+            }
         } else {
             //发送短信给企业用户，账号注册失败
             //您的企业${company_name}账号注册(账号名为${nick_name})，审核失败。${comment}感谢您的支持。
@@ -573,18 +584,18 @@ public class CompanyService extends BaseService<Company> {
                 comment = comment.substring(0, 20);
             }
             templateParam = "{\"nick_name\":\"" + nick_name + "\",\"comment\":\"" + comment + "\",\"company_name\":\"" + company_name + "\"}";
-        }
 
-        try {
-            AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.COMPANY_USER_REGISTER_REJECT, Constant.SINGNAMW, templateParam);
-        } catch (ClientException e) {
-            logger.error("发送阿里巴巴sms错误(ClientException)：{}", e.getMessage());
-            e.printStackTrace();
-            throw new RuntimeException("发送阿里巴巴sms错误(ClientException)：" + e.getMessage());
-        } catch (InterruptedException e) {
-            logger.error("发送阿里巴巴sms错误(InterruptedException)：{}", e.getMessage());
-            e.printStackTrace();
-            throw new RuntimeException("发送阿里巴巴sms错误(InterruptedException)：" + e.getMessage());
+            try {
+                AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.COMPANY_USER_REGISTER_REJECT, Constant.SINGNAMW, templateParam);
+            } catch (ClientException e) {
+                logger.error("发送阿里巴巴sms错误(ClientException)：{}", e.getMessage());
+                e.printStackTrace();
+                throw new RuntimeException("发送阿里巴巴sms错误(ClientException)：" + e.getMessage());
+            } catch (InterruptedException e) {
+                logger.error("发送阿里巴巴sms错误(InterruptedException)：{}", e.getMessage());
+                e.printStackTrace();
+                throw new RuntimeException("发送阿里巴巴sms错误(InterruptedException)：" + e.getMessage());
+            }
         }
     }
 

src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -1250,6 +1250,15 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 industrialLandSupplyConsultation.setIsDefault(false);
                 industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
                 industrialLandSupplyConsultation.setConsultation_time(dateTime);
+                List<String> defaultList = apply.getDefaultList();
+                //2020-10-26 所有咨询都添加同意选框
+                if (!CollectionUtils.isEmpty(defaultList)) {
+                    for (String departmentId : defaultList) {
+                        if (Objects.equals(industrialLandSupplyConsultation.getDepartment_id(),departmentId)) {
+                            industrialLandSupplyConsultation.setIsDefault(true);
+                        }
+                    }
+                }
             }
 
         }
@@ -1357,6 +1366,14 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
 
                 industrialLandSupplyConsultation.setIsDefault(false);
                 industrialLandSupplyConsultation.setIndustrial_land_supply_id(apply.getId() + "");
+                //2020-10-26 所有咨询都添加同意选框
+                if (!CollectionUtils.isEmpty(defaultList)) {
+                    for (String departmentId : defaultList) {
+                        if (Objects.equals(industrialLandSupplyConsultation.getDepartment_id(),departmentId)) {
+                            industrialLandSupplyConsultation.setIsDefault(true);
+                        }
+                    }
+                }
                 if (industrialLandSupplyConsultation.getId() != null) {
                     IndustrialLandSupplyConsultation industrialLandSupplyConsultation1 = industrialLandSupplyConsultationService.findById(industrialLandSupplyConsultation.getId());
                     //如果问的问题没变则保留id等信息 不然作为新的处理
@@ -3407,6 +3424,15 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                 if (CommonUtils.isNull(industrialLandSupplyConsultation.getConsultation_time())) {
                     industrialLandSupplyConsultation.setConsultation_time(dateTime);
                 }
+
+                IndustrialLandSupplyConsultation q = new IndustrialLandSupplyConsultation();
+                q.setIsDefault(true);
+                q.setDepartment_id(industrialLandSupplyConsultation.getDepartment_id());
+                q.setIndustrial_land_supply_id(industrialLandSupplyConsultation.getIndustrial_land_supply_id());
+                List<IndustrialLandSupplyConsultation> dl = industrialLandSupplyConsultationService.findListByWhere(q);
+                if(CommonUtils.isNotNull(dl)){
+                    industrialLandSupplyConsultation.setIsDefault(true);
+                }
             }
 
             //短信参数
@@ -3502,6 +3528,7 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                         industrialLandSupplyConsultation.setIsDefault(false);
                     }
                     //如果原本这个部门的咨询有勾选默认 那么新的咨询也加上默认 原本的默认删除
+                    // 2020-10-26 新逻辑 全部新增 不改之前的
                     IndustrialLandSupplyConsultation q = new IndustrialLandSupplyConsultation();
                     q.setDepartment_id(industrialLandSupplyConsultation.getDepartment_id());
                     q.setDel_flag(false);
@@ -3510,9 +3537,9 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     List<IndustrialLandSupplyConsultation> list = industrialLandSupplyConsultationService.findListByWhere(q);
                     if (CommonUtils.isNotNull(list)) {
                         industrialLandSupplyConsultation.setIsDefault(true);
-                        for (IndustrialLandSupplyConsultation landSupplyConsultation : list) {
-                            industrialLandSupplyConsultationService.deleteById(landSupplyConsultation.getId());
-                        }
+                        //for (IndustrialLandSupplyConsultation landSupplyConsultation : list) {
+                            //industrialLandSupplyConsultationService.deleteById(landSupplyConsultation.getId());
+                        //}
                     }
                 }
                 industrialLandSupplyConsultationService.saveList(industrialLandSupplyConsultationList);

src/main/java/platform/modules/sys/service/ActivityService.java

@@ -85,6 +85,16 @@ public class ActivityService extends BaseService<ActivityDetail> {
      */
     public Integer saveActivity(ActivityDetail activityDetail) throws Exception {
 
+        String ast = activityDetail.getActivity_starttime();
+        String aet = activityDetail.getActivity_endtime();
+        if (ast.length() < 16) {
+            ast = ast.split(" ")[0] + " 00:00:00";
+            activityDetail.setActivity_starttime(ast);
+        }
+        if (aet.length() < 16) {
+            aet = aet.split(" ")[0] + " 23:59:59";
+            activityDetail.setActivity_endtime(aet);
+        }
         this.insertAndGetId(activityDetail);
         Integer activityId = activityDetail.getId();
         //名额不限
@@ -170,6 +180,16 @@ public class ActivityService extends BaseService<ActivityDetail> {
     public boolean updateActivity(ActivityDetail activityDetail) throws Exception {
 
         Integer activityId = activityDetail.getId();
+        String ast = activityDetail.getActivity_starttime();
+        String aet = activityDetail.getActivity_endtime();
+        if (ast.length() < 16) {
+            ast = ast.split(" ")[0] + " 00:00:00";
+            activityDetail.setActivity_starttime(ast);
+        }
+        if (aet.length() < 16) {
+            aet = aet.split(" ")[0] + " 23:59:59";
+            activityDetail.setActivity_endtime(aet);
+        }
         activityPushService.deleteByActivityid(activityDetail.getId());
 
         String streetIds = activityDetail.getPush_street_ids();

src/main/resources/templates/admin/government/industrial_land_supply/feedback_append.html

@@ -67,15 +67,16 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2"><span>附件：</span></label>
             <div class="formControls col-xs-8 col-sm-9">
-<!--                <div id="fileListPre" class="uploader-list">-->
-<!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
-<!--                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.fileDown.file_url}" target="_blank">[[${data.fileDown.file_name}]]</a>-->
-<!--                    </th:block>-->
-<!--                </div>-->
+                <!--                <div id="fileListPre" class="uploader-list">-->
+                <!--                    <th:block th:unless="${data.fileDown==null || data.fileDown.file_url== null}">-->
+                <!--                        <a style="color: #0c80fe;" th:href="${fileUrl} + ${data.fileDown.file_url}" target="_blank">[[${data.fileDown.file_name}]]</a>-->
+                <!--                    </th:block>-->
+                <!--                </div>-->
                 <div class="uploader-list">
                     <th:block th:unless="${data.fileList==null}"
                               th:each="item,itemStat: ${data.fileList}">
-                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a></p>
+                        <p><a style="color: #0c80fe;" th:href="${fileUrl} + ${item.file_url}" target="_blank">[[${item.file_name}]]</a>
+                        </p>
                     </th:block>
                 </div>
             </div>
@@ -108,7 +109,8 @@
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2"></label>
                 <div class="formControls col-xs-8 col-sm-9">
-                    <input th:checked="${item.isDefault}" th:disabled="${item.isDefault}" type="checkbox" th:name="'defaultList['+${itemStat.index}+']'" th:value="${item.id}">要求反馈意见
+                    <input th:checked="${item.isDefault}" th:disabled="${item.isDefault}" type="checkbox"
+                           th:name="'defaultList['+${itemStat.index}+']'" th:value="${item.id}">要求反馈意见
                 </div>
             </div>
             <div class="row cl" th:id=" 'department'+${item.id}">
@@ -125,15 +127,19 @@
                         </thead>
                         <tbody class="add_file_line" th:id="'tbody_department'+${item.id}">
                         <!--<tr class="text-c" th:unless="${landSupplyCons.isDefault}"-->
-                        <tr class="text-c"
+                        <!--<tr class="text-c"
                             th:each="landSupplyCons,landSupplyConsStat: ${industrialLandSupplyConsultationList}"
                             th:if="*{item.id+''==landSupplyCons.department_id}"
                             th:unless="${landSupplyCons.consultation == '请反馈明确意见'}"
+                        >-->
+                        <tr class="text-c"
+                            th:each="landSupplyCons,landSupplyConsStat: ${industrialLandSupplyConsultationList}"
+                            th:if="*{item.id+''==landSupplyCons.department_id}"
                         >
                             <td class="td_material">
                                 <input type="text" class="input-text consultation" placeholder="请输入咨询的问题"
                                        th:name="'consultationList[1'+${landSupplyConsStat.index}+${itemStat.index}+'].consultation'"
-                                       th:value="${landSupplyCons.consultation}" readonly = "readonly"/>
+                                       th:value="${landSupplyCons.consultation}" readonly="readonly"/>
                                 <input class="department_id" type="hidden"
                                        th:name="'consultationList[1'+${landSupplyConsStat.index}+${itemStat.index}+'].department_id'"
                                        th:value="${item.id}"/>
@@ -252,8 +258,8 @@
             $(obj).parent().parent().parent().parent().parent().siblings('.cl').children('.formControls').children('input')[0].checked = false
         } else {
             let canChecked = false
-            $(obj).parent().parent().siblings().each(function(index,item){
-                if($(this).children('.td_material').children('.consultation')[0].attr(value!='')) {
+            $(obj).parent().parent().siblings().each(function (index, item) {
+                if ($(this).children('.td_material').children('.consultation')[0].attr(value != '')) {
                     canChecked = true
                 }
             })
@@ -261,10 +267,11 @@
         }
         $(obj).parent().parent().remove();
     }
-    $(document).ready(function(){
-        $('input[name^="consultationList"]').blur(function(){
+
+    $(document).ready(function () {
+        $('input[name^="consultationList"]').blur(function () {
             console.log('blur事件触发')
-            $('input[name^="consultationList"]').each(function(index,item){
+            $('input[name^="consultationList"]').each(function (index, item) {
                 if (item.value) {
                     console.log('输入框内有值')
                     $(this).parent().parent().parent().parent().parent().siblings('.cl').children('.formControls').children('input')[0].checked = true
@@ -281,8 +288,8 @@
                     } else {
                         console.log('同级元素大于一个要判断是否为空')
                         let canChecked = false
-                        $(this).parent().parent().siblings().each(function(index,item){
-                            if($(this).children('.td_material').children('.consultation')[0].attr(value!='')) {
+                        $(this).parent().parent().siblings().each(function (index, item) {
+                            if ($(this).children('.td_material').children('.consultation')[0].attr(value != '')) {
                                 canChecked = true
                             }
                         })