Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java

@@ -77,7 +77,7 @@ public class SyncGovMatterDetailThread implements Runnable {
         if (rest.getCode() == YesNoEnum.YES.getValue()) {
             List<MatterEntity> matterEntityList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()).source(SourceEnum.政务网.getValue()));
             List<MatterEntity> unSyncDetailMatterList = matterEntityList.stream()
-                    .filter(f -> f.getHaveGetMatterInfo().equalsIgnoreCase("false"))
+                    //.filter(f -> f.getHaveGetMatterInfo().equalsIgnoreCase("false"))
                     .collect(Collectors.toList());
 
             //查询站点事项相关

base-manager/src/main/java/com/mortals/xhx/module/business/service/BusinessMatterService.java

 package com.mortals.xhx.module.business.service;
+
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.business.dao.BusinessMatterDao;
 import com.mortals.xhx.module.business.model.BusinessMatterEntity;
 import com.mortals.xhx.module.business.model.BusinessMatterQuery;
 
 /**
-* BusinessMatterService
-*
-* 业务事项关联 service接口
-*
-* @author zxfei
-* @date 2022-01-12
-*/
-public interface BusinessMatterService extends ICRUDService<BusinessMatterEntity,Long>{
+ * BusinessMatterService
+ * <p>
+ * 业务事项关联 service接口
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
+public interface BusinessMatterService extends ICRUDService<BusinessMatterEntity, Long> {
+
 
+    BusinessMatterDao getDao();
 
     Result<BusinessMatterEntity> getListByBusiness(BusinessMatterQuery query, PageInfo pageInfo, Context context);
 

base-manager/src/main/java/com/mortals/xhx/module/business/service/impl/BusinessMatterServiceImpl.java

 package com.mortals.xhx.module.business.service.impl;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
@@ -8,6 +9,10 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.business.dao.BusinessMatterDao;
 import com.mortals.xhx.module.business.model.BusinessMatterEntity;
 import com.mortals.xhx.module.business.service.BusinessMatterService;
+
+import java.util.Iterator;
+import java.util.List;
+
 /**
 * BusinessMatterService
 * 业务事项关联 service实现
@@ -18,6 +23,40 @@ import com.mortals.xhx.module.business.service.BusinessMatterService;
 @Service("businessMatterService")
 public class BusinessMatterServiceImpl extends AbstractCRUDServiceImpl<BusinessMatterDao, BusinessMatterEntity, Long> implements BusinessMatterService {
 
+
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveBefore(BusinessMatterEntity entity, Context context) throws AppException {
+        super.saveBefore(entity, context);
+        int count = this.getDao().getCount(new BusinessMatterQuery().siteBusinessId(entity.getSiteBusinessId()).matterId(entity.getMatterId()));
+        if(count>0){
+            throw new AppException("当前业务事项已存在，不能新增");
+        }
+    }
+
+    /**
+     * @param list
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveBefore(List<BusinessMatterEntity> list, Context context) throws AppException {
+        //批量校验列表 如果存在 则剔除
+        Iterator<BusinessMatterEntity> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            BusinessMatterEntity next = iterator.next();
+            int count = this.getDao().getCount(new BusinessMatterQuery().siteBusinessId(next.getSiteBusinessId()).matterId(next.getMatterId()));
+            if(count>0){
+                iterator.remove();
+            }
+        }
+        super.saveBefore(list, context);
+    }
+
     @Override
     public Result<BusinessMatterEntity> getListByBusiness(BusinessMatterQuery query, PageInfo pageInfo, Context context) {
         return this.getDao().getListByBusiness(query,pageInfo);

base-manager/src/main/java/com/mortals/xhx/module/business/web/BusinessMatterController.java

 package com.mortals.xhx.module.business.web;
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
@@ -18,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import static com.mortals.framework.ap.SysConstains.*;
@@ -119,5 +122,23 @@ public class BusinessMatterController extends BaseCRUDJsonBodyMappingController<
     }
 
 
-
+    /**
+     * @param list
+     * @param model
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void batchSaveBefore(List<BusinessMatterEntity> list, Map<String, Object> model, Context context) throws AppException {
+        //批量校验列表 如果存在 则剔除
+        Iterator<BusinessMatterEntity> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            BusinessMatterEntity next = iterator.next();
+            int count = this.service.getDao().getCount(new BusinessMatterQuery().siteBusinessId(next.getSiteBusinessId()).matterId(next.getMatterId()));
+            if(count>0){
+                iterator.remove();
+            }
+        }
+        super.batchSaveBefore(list, model, context);
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -1274,7 +1274,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             datumEntity.initAttrValue();
             datumEntity.setMatterId(matterEntity.getId());
             datumEntity.setMatterCode(matterEntity.getMatterNo());
-            datumEntity.setMaterialName(matterEntity.getMatterName());
+            datumEntity.setMatterName(matterEntity.getMatterName());
             datumEntity.setSource(SourceEnum.政务网.getValue());
             datumEntity.setCreateTime(new Date());
             datumEntity.setCreateUser("system");

base-manager/src/main/resources/sqclinfo.setting

@@ -8,7 +8,7 @@
 备注 = remark
 是否减免 = isjianm
 纸质材料份数 = paperNum
-材料名称 = matterName
+材料名称 = materialName
 填报须知 = remarkSub
 受理标准 = summary
 来源渠道 = materialSource

base-manager/src/test/java/com/mortals/httpclient/business/BusinessMatterController.http

@@ -5,9 +5,8 @@ Content-Type: application/json
 
 {
   "page": 1,
-  "matterId": 123,
-  "siteId": 53,
-  "size": 10
+  "siteBusinessId": 11,
+  "size": -1
 }
 
 ###业务事项关联列表
@@ -30,14 +29,15 @@ Content-Type: application/json
 
 ###业务事项关联更新与保存
 POST {{baseUrl}}/business/matter/save
+Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "siteId":9255,
+        "siteId":1,
         "siteName":"w19oxc",
-        "siteBusinessId":7038,
+        "siteBusinessId":11,
         "siteBusinessName":"ujaud2",
-        "matterId":3913,
+        "matterId":34034,
         "matterName":"iajw6p"
 }
 

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue

@@ -101,6 +101,7 @@
                 </span>
                 <span><i class="lable">评价来源：</i>{{queEvaData.source?queEvaData.source:'--'}}</span>
                 <span><i class="lable">评价设备：</i>{{queEvaData.pj_name?queEvaData.pj_name:'--'}}</span>
+                <span><i class="lable">评价状态：</i>{{!queEvaData.evaluatestatus?'--':queEvaData.evaluatestatus==1?'等待评价':queEvaData.evaluatestatus==2?'完成':queEvaData.evaluatestatus==3?'截图有误':queEvaData.evaluatestatus==4?'用户截图签名超时':queEvaData.evaluatestatus==5?'用户评价超时':'收到图片等待签名'}}</span>
                 <span><i class="lable">评价人照片：</i>
                   <a-avatar v-if="!queEvaData.picture || !baseurl" shape="square" :size="40" icon="user" />
                   <img v-else :src="baseurl+'/'+queEvaData.picture" alt="" srcset="" style="max-width: 100px; max-height: 100px;">
@@ -145,6 +146,7 @@
                 </span>
                 <span><i class="lable">评价来源：</i>{{queEvaData.source?queEvaData.source:'--'}}</span>
                 <span><i class="lable">评价设备：</i>--</span>
+                <span><i class="lable">评价状态：</i>{{!queEvaData.evaluatestatus?'--':queEvaData.evaluatestatus==1?'等待评价':queEvaData.evaluatestatus==2?'完成':queEvaData.evaluatestatus==3?'截图有误':queEvaData.evaluatestatus==4?'用户截图签名超时':queEvaData.evaluatestatus==5?'用户评价超时':'收到图片等待签名'}}</span>
                 <span>
                   <i class="lable">评价人照片：</i>
                   <a-avatar v-if="!queEvaData.picture" shape="square" :size="40" icon="user" />