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

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

@@ -441,7 +441,9 @@ public class MatterDetailHtmlParseUtil {
         // String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0000400004-511500000000-000-1151120000870212XU-1-00&taskType=1&deptCode=3922757070285361152";
         // String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=512036008003-511500000000-000-11511200MB1503849K-1-00&taskType=20&deptCode=3907787168696946688";
         //String url = "https://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0101600004-511500000000-000-11511200008702584B-1-00&taskType=1&deptCode=511501-7";
-        String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0358400001-511500000000-000-11511200MB1666138E-1-00&taskType=1&deptCode=11511200008702664Y";
+        //String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511500000000&itemCode=511A0358400001-511500000000-000-11511200MB1666138E-1-00&taskType=1&deptCode=11511200008702664Y";
+        //String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511722000000&itemCode=511Z07001006-511722000000-000-115114220088257013-1-00&taskType=10&deptCode=115114220088257013";
+        String url = "http://www.sczwfw.gov.cn/jiq/front/transition/ywTransToDetail?areaCode=511722000000&itemCode=511A0147300000-511722000000-000-11511422008822367F-1-00&taskType=1&deptCode=11511422008822367F";
 
         Document dom = MatterDetailHtmlParseUtil.getDomByHtml(url);
         Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

@@ -56,7 +56,7 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
 
 
     public AppController() {
-        super.setModuleDesc("自助终端应用");
+        super.setModuleDesc("应用");
     }
 
     @Override

base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java

@@ -1839,7 +1839,7 @@ public class MatterEntity extends MatterVo {
 
         this.promiseEndExplain = "";
 
-        this.isChargesShow = "否";
+        this.isChargesShow = "无";
 
         this.certificationLevelsShow = "实名认证";
 
@@ -1851,13 +1851,13 @@ public class MatterEntity extends MatterVo {
 
         this.windowToTheSceneNum = null;
 
-        this.isOnlineSubscribeShow = "否";
+        this.isOnlineSubscribeShow = "无";
 
-        this.isExpressTakeShow = "否";
+        this.isExpressTakeShow = "无";
 
-        this.isProvinceAcquisitionShow = "否";
+        this.isProvinceAcquisitionShow = "无";
 
-        this.isApplyProvinceShow = "否";
+        this.isApplyProvinceShow = "无";
 
         this.mustSceneExplain = "";
 
@@ -1869,7 +1869,7 @@ public class MatterEntity extends MatterVo {
 
         this.isExpressTakeOnlineShow = "";
 
-        this.isDoorTakeShow = "否";
+        this.isDoorTakeShow = "无";
 
         this.onlineMustSceneExplain = "";
 
@@ -1885,17 +1885,17 @@ public class MatterEntity extends MatterVo {
 
         this.performDeptTypeShow = "";
 
-        this.goveServiceCenterShow = "否";
+        this.goveServiceCenterShow = "无";
 
-        this.isConvenientCenterShow = "否";
+        this.isConvenientCenterShow = "无";
 
-        this.terminalHandle = "是";
+        this.terminalHandle = "无";
 
-        this.isOnline = "是";
+        this.isOnline = "无";
 
-        this.isOnlinePayShow = "是";
+        this.isOnlinePayShow = "无";
 
-        this.entrustmentDepartmen = "是";
+        this.entrustmentDepartmen = "无";
 
         this.jointInfoShow = "";
 

base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

@@ -177,6 +177,11 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
         if (FileUtil.isEmpty(new File(targetFilePath))) {
             throw new AppException("文件不存在！");
         }
+
+        if (!FileUtil.getSuffix(picfilePath).equals("zip")) {
+            throw new AppException("压缩只支持zip文件！");
+        }
+
         //解压图片
         String fileEncode = "UTF-8";
         try {
@@ -243,12 +248,26 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
         StringBuilder failureDetailMsg = new StringBuilder();
         for (WorkmanEntity entity : list) {
             try {
-                entity.setCreateUserId(context == null ? 1L : context.getUser() == null ? 1L : context.getUser().getId());
-                entity.setCreateTime(new Date());
-                WorkmanEntity save = this.save(entity, context);
-                if (save != null) {
-                    successNum++;
+                //通过用户名判断是更新还是新增;
+                WorkmanEntity workmanEntity = this.selectOne(new WorkmanQuery().loginName(entity.getLoginName()), context);
+                if (!ObjectUtils.isEmpty(workmanEntity)) {
+                    entity.setId(workmanEntity.getId());
+                    entity.setDeleted(YesNoEnum.NO.getValue());
+                    entity.setUpdateUserId(this.getContextUserId(context));
+                    entity.setCreateTime(new Date());
+                    WorkmanEntity update = this.update(entity, context);
+                    if (update != null) {
+                        successNum++;
+                    }
+                }else{
+                    entity.setCreateUserId(this.getContextUserId(context));
+                    entity.setCreateTime(new Date());
+                    WorkmanEntity save = this.save(entity, context);
+                    if (save != null) {
+                        successNum++;
+                    }
                 }
+
             } catch (Exception e) {
                 log.error("导入异常", e);
                 failureNum++;