增加每月重复校验，处理问题

src/main/java/com/cm/inspection/controller/app/apis/enterprise/EnterpriseAppController.java

@@ -8,6 +8,7 @@ import com.cm.common.exception.SearchException;
 import com.cm.common.pojo.ListPage;
 import com.cm.common.result.ErrorResult;
 import com.cm.common.result.SuccessResult;
+import com.cm.common.result.SuccessResultData;
 import com.cm.common.result.SuccessResultList;
 import com.cm.inspection.pojo.dtos.enterprise.EnterpriseDTO;
 import com.cm.inspection.pojo.vos.enterprise.EnterpriseVO;
@@ -42,8 +43,8 @@ public class EnterpriseAppController extends AbstractController {
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @PostMapping("saveenterprise")
     @CheckRequestBodyAnnotation
-    public SuccessResult saveEnterprise(@RequestHeader("token") String token, @RequestBody EnterpriseVO enterpriseVO) throws Exception {
+    public SuccessResultData<String> saveEnterprise(@RequestHeader("token") String token, @RequestBody EnterpriseVO enterpriseVO) throws Exception {
-        return enterpriseService.saveEnterpriseByToken(token, enterpriseVO);
+        return enterpriseService.saveEnterpriseByTokenReturnId(token, enterpriseVO);
     }
 
     @ApiOperation(value = "删除企业(id列表)", notes = "删除企业(id列表)接口")

src/main/java/com/cm/inspection/service/check/ICheckService.java

@@ -44,6 +44,16 @@ public interface ICheckService {
      */
     SuccessResult saveCheckByToken(String token, CheckVO checkVO) throws Exception;
 
+    /**
+     * 新增检查表(APP)
+     *
+     * @param token
+     * @param checkVO
+     * @return
+     * @throws Exception
+     */
+    SuccessResultData<String> saveCheckByTokenReturnId(String token, CheckVO checkVO) throws Exception;
+
     /**
      * 新增复查表
      *

src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java

@@ -8,6 +8,7 @@ import com.cm.common.result.SuccessResult;
 import com.cm.common.result.SuccessResultData;
 import com.cm.common.result.SuccessResultList;
 import com.cm.common.token.app.AppTokenManager;
+import com.cm.common.token.app.entity.AppToken;
 import com.cm.common.utils.DateUtil;
 import com.cm.common.utils.HashMapUtil;
 import com.cm.common.utils.UUIDUtil;
@@ -89,6 +90,11 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
         return new SuccessResult();
     }
 
+    @Override
+    public SuccessResultData<String> saveCheckByTokenReturnId(String token, CheckVO checkVO) throws Exception {
+        return new SuccessResultData<>(saveCheckInfoReturnId(token, checkVO));
+    }
+
     @Override
     public SuccessResult saveReCheck(String checkId, CheckVO checkVO) throws Exception {
         saveReCheckInfo(null, checkId, checkVO);
@@ -140,9 +146,24 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
      * @throws Exception
      */
     private void saveCheckInfo(String token, CheckVO checkVO) throws Exception {
+        saveCheckInfoReturnId(token, checkVO);
+    }
+
+    /**
+     * 新增检查表
+     *
+     * @param token
+     * @param checkVO
+     * @return 新增ID
+     * @throws Exception
+     */
+    private String saveCheckInfoReturnId(String token, CheckVO checkVO) throws Exception {
+        if (isEnterpriseCheckedForCurrentMonth(token, checkVO.getEnterpriseId())) {
+            throw new SaveException("本月已经检查过该企业，无需重复检查");
+        }
+        String checkId = UUIDUtil.getUUID();
         checkVO.setIsComplete(0);
         Integer isCoordination = checkVO.getIsCoordination();
-        String checkId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.beanToMap(checkVO);
         saveCheckWithId(checkId, token, params);
         LOG.debug("开启流程");
@@ -158,6 +179,30 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
             taskCheckVO.setIsHandled(1);
             taskCheckService.updateTaskCheckByToken(token, checkVO.getTaskCheckId(), taskCheckVO);
         }
+        return checkId;
+    }
+
+    /**
+     * 当月企业是否检查
+     *
+     * @param enterpriseId
+     * @return
+     */
+    private boolean isEnterpriseCheckedForCurrentMonth(String token, String enterpriseId) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("enterpriseId", enterpriseId);
+        params.put("checkMonth", DateTime.now().toString(DateTimeFormat.forPattern("yyyy-MM")));
+        params.put("checkType", 1);
+        if (StringUtils.isBlank(token)) {
+            params.put("creator", securityComponent.getCurrentUser().getUserId());
+        } else {
+            params.put("creator", AppTokenManager.getInstance().getToken(token).getAppTokenUser().getId());
+        }
+        Integer countCheck = checkDao.countCheck(params);
+        if (countCheck > 0) {
+            return true;
+        }
+        return false;
     }
 
     /**

src/main/java/com/cm/inspection/service/enterprise/IEnterpriseService.java

@@ -42,6 +42,16 @@ public interface IEnterpriseService {
      */
     SuccessResult saveEnterpriseByToken(String token, EnterpriseVO enterpriseVO) throws Exception;
 
+    /**
+     * 新增企业(APP)
+     *
+     * @param token
+     * @param enterpriseVO
+     * @return 返回ID
+     * @throws SearchException
+     */
+    SuccessResultData<String> saveEnterpriseByTokenReturnId(String token, EnterpriseVO enterpriseVO) throws Exception;
+
     /**
      * 删除企业
      *
@@ -155,4 +165,5 @@ public interface IEnterpriseService {
      * @throws SearchException
      */
     SuccessResultData<Map<String, Object>> countEnterpriseByNature(Map<String, Object> params) throws SearchException;
+
 }

src/main/java/com/cm/inspection/service/enterprise/impl/EnterpriseServiceImpl.java

@@ -57,6 +57,11 @@ public class EnterpriseServiceImpl extends BaseService implements IEnterpriseSer
         return new SuccessResult();
     }
 
+    @Override
+    public SuccessResultData<String> saveEnterpriseByTokenReturnId(String token, EnterpriseVO enterpriseVO) throws Exception {
+        return new SuccessResultData<>(saveEnterpriseInfoReturnId(token, enterpriseVO));
+    }
+
     /**
      * 新增企业
      *
@@ -65,6 +70,18 @@ public class EnterpriseServiceImpl extends BaseService implements IEnterpriseSer
      * @throws Exception
      */
     private void saveEnterpriseInfo(String token, EnterpriseVO enterpriseVO) throws Exception {
+        saveEnterpriseInfoReturnId(token, enterpriseVO);
+    }
+
+    /**
+     * 新增企业
+     *
+     * @param token
+     * @param enterpriseVO
+     * @return 返回ID
+     * @throws Exception
+     */
+    private String saveEnterpriseInfoReturnId(String token, EnterpriseVO enterpriseVO) throws Exception {
         String enterpriseId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.beanToMap(enterpriseVO);
         params.put("enterpriseId", enterpriseId);
@@ -80,6 +97,7 @@ public class EnterpriseServiceImpl extends BaseService implements IEnterpriseSer
         enterpriseOfGridOperatorVO.setEnterpriseId(enterpriseId);
         enterpriseOfGridOperatorVO.setUserId(params.get("creator").toString());
         enterpriseOfGridOperatorService.saveEnterpriseOfGridOperatorByToken(token, enterpriseOfGridOperatorVO);
+        return enterpriseId;
     }
 
     @Override

src/main/resources/mybatis/mapper/check/check-mapper.xml

@@ -306,6 +306,10 @@
             gen_check
         WHERE
             is_delete = 0
+        <if test="enterpriseId != null and enterpriseId != ''">
+        AND
+            enterprise_id = #{enterpriseId}
+        </if>
         <if test="creator != null and creator != ''">
         AND
             creator = #{creator}

src/main/resources/mybatis/mapper/checkitem/checkitem-mapper.xml

@@ -41,7 +41,7 @@
             #{name},
             #{summary},
             #{icon},
-            #{iconPress}
+            #{iconPress},
             #{creator},
             #{gmtCreate},
             #{modifier},

src/main/resources/static/route/check/list-check-history-mine.html

@@ -39,6 +39,27 @@
                                 {{# } }}
                             </select>
                         </script>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="checkType" name="checkType">
+                                <option value="">检查类型</option>
+                                <option value="1">检查</option>
+                                <option value="2">复查</option>
+                            </select>
+                        </div>
+                        <div class="layui-inline layui-form search-item">
+                            <select name="isCoordination" id="isCoordination">
+                                <option value="">是否配合</option>
+                                <option value="0">不配合</option>
+                                <option value="1">配合</option>
+                            </select>
+                        </div>
+                        <div class="layui-inline layui-form search-item">
+                            <select name="isComplete" id="isComplete">
+                                <option value="">是否完成</option>
+                                <option value="0">未完成</option>
+                                <option value="1">完成</option>
+                            </select>
+                        </div>
                         <button type="button" id="search" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-search"></i> 搜索
                         </button>
@@ -228,6 +249,9 @@
                     },
                     {field: 'updateCheckMine', width: 110, title: '检查结果', fixed:'right', align:'center',
                         templet: function(row) {
+                            if(row.isCoordination != 1) {
+                                return '不配合';
+                            }
                             return '<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="getCheckMineEvent"><i class="fa fa-lg fa-search"></i> 检查项</button>';
                         }
                     },
@@ -251,6 +275,9 @@
                     keywords: $('#keywords').val(),
                     type: $('#type').val(),
                     industry: $('#industry').val(),
+                    checkType: $('#checkType').val(),
+                    isCoordination: $('#isCoordination').val(),
+                    isComplete: $('#isComplete').val()
                 },
                 page: {
                     curr: currentPage

src/main/resources/static/route/check/list-check.html

@@ -38,6 +38,13 @@
                                 {{# } }}
                             </select>
                         </script>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="checkType" name="checkType">
+                                <option value="">检查类型</option>
+                                <option value="1">检查</option>
+                                <option value="2">复查</option>
+                            </select>
+                        </div>
                         <div class="layui-inline layui-form search-item">
                             <select name="isCoordination" id="isCoordination">
                                 <option value="">是否配合</option>
@@ -270,6 +277,7 @@
                     keywords: $('#keywords').val(),
                     type: $('#type').val(),
                     industry: $('#industry').val(),
+                    checkType: $('#checkType').val(),
                     isCoordination: $('#isCoordination').val(),
                     isComplete: $('#isComplete').val()
                 },

src/main/resources/static/route/check/save-check.html

@@ -85,14 +85,14 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">是否配合</label>
                     <div class="layui-input-block">
-                        <select id="isCoordination" name="isCoordination" lay-verify="required">
+                        <select id="isCoordination" name="isCoordination" lay-verify="required" lay-filter="isCoordination">
                             <option value="">请选择</option>
                             <option value="0">不配合</option>
                             <option value="1">配合</option>
                         </select>
                     </div>
                 </div>
-                <div class="layui-form-item layui-form-text">
+                <div id="checkItemReportBox" class="layui-form-item layui-form-text" style="display: none;">
                     <div class="layui-input-block" id="checkItemTemplateBox"></div>
                     <script id="checkItemTemplate" type="text/html">
                         <table class="layui-table">
@@ -514,6 +514,14 @@
             }
         });
 
+        form.on('select(isCoordination)', function(data) {
+            if(data.value == 1) {
+                $('#checkItemReportBox').show();
+            } else {
+                $('#checkItemReportBox').hide();
+            }
+        });
+
         // area1 选择事件
         form.on('select(area1)', function(data) {
             initArea2Select(data.value);

src/main/resources/static/route/check/save-recheck-mine.html

@@ -37,14 +37,14 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">是否配合</label>
                     <div class="layui-input-block">
-                        <select id="isCoordination" name="isCoordination" lay-verify="required">
+                        <select id="isCoordination" name="isCoordination" lay-verify="required" lay-filter="isCoordination">
                             <option value="">请选择</option>
                             <option value="0">未整改</option>
                             <option value="1">配合</option>
                         </select>
                     </div>
                 </div>
-                <div class="layui-form-item layui-form-text">
+                <div id="checkItemReportBox" class="layui-form-item layui-form-text" style="display: none;">
                     <div class="layui-input-block" id="checkItemTemplateBox"></div>
                     <script id="checkItemTemplate" type="text/html">
                         <table class="layui-table">
@@ -320,6 +320,14 @@
             }
         });
 
+        form.on('select(isCoordination)', function(data) {
+            if(data.value == 1) {
+                $('#checkItemReportBox').show();
+            } else {
+                $('#checkItemReportBox').hide();
+            }
+        });
+
         form.on('radio(checkItemOptionCheckResult)', function(data) {
             var name = data.elem.name;
             var checkItemId = name.split('_')[2];

src/main/resources/static/route/check/save-taskcheck-mine.html

@@ -31,14 +31,14 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">是否配合</label>
                     <div class="layui-input-block">
-                        <select id="isCoordination" name="isCoordination" lay-verify="required">
+                        <select id="isCoordination" name="isCoordination" lay-verify="required" lay-filter="isCoordination">
                             <option value="">请选择</option>
                             <option value="0">未整改</option>
                             <option value="1">配合</option>
                         </select>
                     </div>
                 </div>
-                <div class="layui-form-item layui-form-text">
+                <div id="checkItemReportBox" class="layui-form-item layui-form-text" style="display: none;">
                     <div class="layui-input-block" id="checkItemTemplateBox"></div>
                     <script id="checkItemTemplate" type="text/html">
                         <table class="layui-table">
@@ -324,6 +324,14 @@
             }
         });
 
+        form.on('select(isCoordination)', function(data) {
+            if(data.value == 1) {
+                $('#checkItemReportBox').show();
+            } else {
+                $('#checkItemReportBox').hide();
+            }
+        });
+
         form.on('radio(checkItemOptionCheckResult)', function(data) {
             var name = data.elem.name;
             var checkItemId = name.split('_')[2];

src/main/resources/static/route/checkitem/list-checkitem.html

@@ -157,6 +157,7 @@
                     var layIndex;
                     top.restAjax.delete(top.restAjax.path('api/checkitem/removecheckitem/{ids}', [ids]), {}, null, function (code, data) {
                         top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
+                        parent.common.refreshTree('leftTree');
                         reloadTable();
                     }, function (code, data) {
                         top.dialog.msg(data.msg);

src/main/resources/static/route/checkitemoption/save-checkitemoption.html

@@ -43,7 +43,7 @@
                     </div>
                 </div>
                 <div class="layui-form-item" pane>
-                    <label class="layui-form-label">错误项</label>
+                    <label class="layui-form-label">整改项</label>
                     <div class="layui-input-block">
                         <input type="radio" name="isWrong" value="0" title="否" checked>
                         <input type="radio" name="isWrong" value="1" title="是">

src/main/resources/static/route/checkitemoption/update-checkitemoption.html

@@ -43,7 +43,7 @@
                     </div>
                 </div>
                 <div class="layui-form-item" pane>
-                    <label class="layui-form-label">错误项</label>
+                    <label class="layui-form-label">整改项</label>
                     <div class="layui-input-block">
                         <input type="radio" name="isWrong" value="0" title="否">
                         <input type="radio" name="isWrong" value="1" title="是">