Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue

@@ -184,8 +184,8 @@ export default {
   data() {
     return {
       searchVal: "",
-      siteId: local.getLocal("writeSiteId")
-        ? local.getLocal("writeSiteId")
+      siteId: local.getLocal("sampleSiteId")
+        ? local.getLocal("sampleSiteId")
         : "",
       tableData: [],
       pageSizes: [10, 20, 30, 40, 50, 100, 200],

sample-form-manager-ui/admin/src/pages/layouts/Layouts.vue

@@ -71,8 +71,8 @@ export default {
     // 获取部门列表
     async getdeptList() {
       let res = await getdeptList({
-        siteId: local.getLocal("writeSiteId")
-          ? local.getLocal("writeSiteId")
+        siteId: local.getLocal("sampleSiteId")
+          ? local.getLocal("sampleSiteId")
           : "",
       });
       let { code, data } = res.data;

sample-form-manager-ui/admin/src/pages/layouts/components/HeaderSite.vue

@@ -178,7 +178,7 @@ export default {
       //   siteName: obj.label,
       //   siteid: obj.id,
       // };
-      local.setLocal("writeSiteId", obj.id);
+      local.setLocal("sampleSiteId", obj.id);
       this.show = false;
       if (location.href.search(/token/gi) >= 0) {
         setTimeout(() => {

sample-form-manager-ui/admin/src/pages/software/materials/MaterialsManage.vue

@@ -296,8 +296,8 @@ export default {
   },
   data() {
     return {
-      siteId: local.getLocal("writeSiteId")
-        ? local.getLocal("writeSiteId")
+      siteId: local.getLocal("sampleSiteId")
+        ? local.getLocal("sampleSiteId")
         : "",
       departmentLeft: "",
       departmentRight: "",

sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue

@@ -41,13 +41,14 @@
         <el-form-item label="上传附件" prop="fileUrl">
           <el-upload
             class="upload-demo"
-            :action="api + 'fm/file/commonupload'"
+            :action="api + 'sampleform/file/commonupload'"
             :on-remove="handleRemoveFileUrl"
             :limit="1"
             :file-list="fileUrlFileList"
             :on-success="OnsuccessfileUrl"
             :headers="headers"
             :before-upload="beforeUpload"
+            accept="application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
           >
             <el-button size="small" type="primary">上传Word文件</el-button>
           </el-upload>
@@ -55,13 +56,14 @@
         <el-form-item label="上传模板" prop="templatePath">
           <el-upload
             class="upload-demo"
-            :action="api + 'fm/file/commonupload'"
+            :action="api + 'sampleform/file/commonupload'"
             :on-remove="handleRemoveTemplatePath"
             :limit="1"
             :file-list="templatePathFileList"
             :on-success="OnsuccesstemplatePath"
             :headers="headers"
             :before-upload="beforeUpload"
+            accept="application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
           >
             <el-button size="small" type="primary">上传Word文件</el-button>
           </el-upload>
@@ -69,13 +71,14 @@
         <el-form-item label="上传样表" prop="samplePath">
           <el-upload
             class="upload-demo"
-            :action="api + 'fm/file/commonupload'"
+            :action="api + 'sampleform/file/commonupload'"
             :on-remove="handleRemoveSamplePath"
             :limit="1"
             :file-list="samplePathFileList"
             :on-success="OnsuccessSamplePath"
             :headers="headers"
             :before-upload="beforeUpload"
+            accept="application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
           >
             <el-button size="small" type="primary">上传Word文件</el-button>
           </el-upload>

sample-form-manager-ui/admin/src/pages/software/matter/MatterManage.vue

@@ -288,8 +288,8 @@ export default {
   },
   data() {
     return {
-      siteId: local.getLocal("writeSiteId")
-        ? local.getLocal("writeSiteId")
+      siteId: local.getLocal("sampleSiteId")
+        ? local.getLocal("sampleSiteId")
         : "",
       departmentLeft: "",
       departmentRight: "",
@@ -330,7 +330,7 @@ export default {
         size: this.rightSize,
         matterName: this.rightSearch,
         deptId: this.departmentRight,
-        siteId: this.siteId,
+        //siteId: this.siteId,
       });
       if (res.data.code === 1) {
         let { total, data } = res.data.data;
@@ -457,7 +457,7 @@ export default {
     },
     // 右边加入
     async handleJoin(id) {
-      let res = await createMatter({ ids: id });
+      let res = await createMatter({ ids: id,siteId:this.siteId });
       let { code, msg } = res.data;
       if (code === 1) {
         this.$message.success(msg);

sample-form-manager-ui/admin/src/pages/software/matter/modal/AddMatter.vue

@@ -85,8 +85,8 @@ export default {
         matterName: "", // 事项简称
         deptId: "", // 部门id
         matterNo: "", // 事项编号
-        siteId: local.getLocal("writeSiteId")
-          ? local.getLocal("writeSiteId")
+        siteId: local.getLocal("sampleSiteId")
+          ? local.getLocal("sampleSiteId")
           : "",
         source: 0,
         deptName: "",

sample-form-manager/src/main/bin/start.sh

@@ -60,7 +60,7 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
 				-Djava.io.tmpdir=$TEMP_PATH \
-				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15609 \
+				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=15689 \
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

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

@@ -333,9 +333,9 @@ public class MatterEntity extends MatterVo {
 
             this.deptName = "";
 
-            this.total = null;
+            this.total = 0;
 
-            this.sort = null;
+            this.sort = 0;
 
             this.isRecommend = 0;
 

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java

 package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 /**
@@ -15,7 +17,7 @@ public interface MatterService extends ICRUDService<MatterEntity,Long>{
      * 站点事项转系统事项
      * @param sheetMatterIds
      */
-    void createMatterbBySheetMatter(Long[] sheetMatterIds);
+    Rest<String> createMatterbBySheetMatter(Long[] sheetMatterIds,Long siteId, Context context);
 
     /**
      * 推荐or取消推荐

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

 package com.mortals.xhx.module.matter.service.impl;
+
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.MatterSourceEnum;
 import com.mortals.xhx.common.key.ParamKey;
 import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
 import com.mortals.xhx.module.sheet.dao.SheetMatterDao;
 import com.mortals.xhx.module.sheet.model.SheetMatterEntity;
+import com.mortals.xhx.module.sheet.model.SheetMatterQuery;
+import com.mortals.xhx.module.sheet.service.SheetMatterService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,16 +22,17 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.matter.dao.MatterDao;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.service.MatterService;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 
 /**
-* MatterService
-* 事项申请材料 service实现
-*
-* @author zxfei
-* @date 2022-09-27
-*/
+ * MatterService
+ * 事项申请材料 service实现
+ *
+ * @author zxfei
+ * @date 2022-09-27
+ */
 @Service("matterService")
 public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, MatterEntity, Long> implements MatterService {
 
@@ -34,27 +40,18 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     @Autowired
     private ParamService paramService;
     @Autowired
-    private SheetMatterDao sheetMatterDao;
+    private SheetMatterService sheetMatterService;
     @Autowired
     private MatterDatumService matterDatumService;
 
     @Override
     protected MatterEntity findBefore(MatterEntity params, PageInfo pageInfo, Context context) throws AppException {
-        if(StringUtils.isNotEmpty(params.getMatterName())){
+        if (StringUtils.isNotEmpty(params.getMatterName())) {
             params.setMatterName("%".concat(params.getMatterName()).concat("%"));
         }
         return params;
     }
 
-    @Override
-    protected void saveBefore(MatterEntity entity, Context context) throws AppException {
-        entity.setTotal(0);
-        entity.setSort(0);
-        entity.setIsRecommend(0);
-        entity.setSource(MatterSourceEnum.MANUAL.getValue());
-        this.validData(entity, context);
-    }
-
     @Override
     protected void updateBefore(MatterEntity entity, Context context) throws AppException {
         entity.setIsRecommend(null);
@@ -63,88 +60,105 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
     @Override
     protected void removeBefore(Long[] ids, Context context) throws AppException {
-        List<MatterEntity> queryList = this.get(ids,context);
-        if(CollectionUtils.isNotEmpty(queryList)){
+        List<MatterEntity> queryList = this.get(ids, context);
+        if (CollectionUtils.isNotEmpty(queryList)) {
             int recommendCount = paramService.getParamIntValue(ParamKey.MATTER_RECOMMEND_COUNT);
-            for(MatterEntity matterEntity:queryList){
-                if(matterEntity.getIsRecommend()==1){
+            for (MatterEntity matterEntity : queryList) {
+                if (matterEntity.getIsRecommend() == 1) {
                     recommendCount--;
                 }
             }
-            paramService.setValueByKey(ParamKey.MATTER_RECOMMEND_COUNT,String.valueOf(recommendCount));
+            paramService.setValueByKey(ParamKey.MATTER_RECOMMEND_COUNT, String.valueOf(recommendCount));
         }
     }
 
     @Override
     protected void findAfter(MatterEntity entity, PageInfo pageInfo, Context context, List<MatterEntity> list) throws AppException {
-        if(CollectionUtils.isNotEmpty(list)){
-            for(MatterEntity matterEntity:list){
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (MatterEntity matterEntity : list) {
                 MatterDatumEntity query = new MatterDatumEntity();
                 query.setMatterId(matterEntity.getId());
-                int datumCount = matterDatumService.count(query,context);
+                int datumCount = matterDatumService.count(query, context);
                 matterEntity.setDatumCount(datumCount);
             }
         }
     }
 
     @Override
-    public void createMatterbBySheetMatter(Long[] sheetMatterIds) {
-        List<SheetMatterEntity> sheetMatterEntityList = sheetMatterDao.get(sheetMatterIds);
-        if(CollectionUtils.isNotEmpty(sheetMatterEntityList)){
-            Date now = new Date();
-            List<MatterEntity> list = new ArrayList<>();
-            for(SheetMatterEntity sheetMatterEntity:sheetMatterEntityList){
-                MatterEntity query = new MatterEntity();
-                query.setSiteId(sheetMatterEntity.getSiteId());
-                query.setTid(sheetMatterEntity.getTid());
-                query.setTcode(sheetMatterEntity.getTcode());
-                List<MatterEntity> queryList = this.find(query);
-                if(CollectionUtils.isNotEmpty(queryList)){
-                    continue;
-                }
-                MatterEntity matterEntity = new MatterEntity();
-                matterEntity.setSiteId(sheetMatterEntity.getSiteId());
-                matterEntity.setTid(sheetMatterEntity.getTid());
-                matterEntity.setTcode(sheetMatterEntity.getTcode());
-                matterEntity.setTname(sheetMatterEntity.getTname());
-                matterEntity.setMatterName(sheetMatterEntity.getMatterName());
-                matterEntity.setEnglishName(sheetMatterEntity.getEnglishName());
-                matterEntity.setMatterNo(sheetMatterEntity.getMatterNo());
-                matterEntity.setMatterFullName(sheetMatterEntity.getMatterName());
-                matterEntity.setTotal(0);
-                matterEntity.setSort(0);
-                matterEntity.setIsRecommend(0);
-                matterEntity.setSource(MatterSourceEnum.AUTO.getValue());
-                matterEntity.setCreateUserId(1l);
-                matterEntity.setCreateTime(now);
-                list.add(matterEntity);
+    public Rest<String> createMatterbBySheetMatter(Long[] sheetMatterIds, Long siteId, Context context) {
+        if(ObjectUtils.isEmpty(sheetMatterIds)){
+            throw new AppException("事项ids is null");
+        }
+        int success = 0;
+        int fail = 0;
+        List<SheetMatterEntity> sheetMatterEntityList = sheetMatterService.get(sheetMatterIds, context);
+        for (SheetMatterEntity sheetMatterEntity : sheetMatterEntityList) {
+            Boolean bool = updateOrSave(sheetMatterEntity, siteId, context);
+            if (bool) {
+                success++;
+            } else {
+                fail++;
+            }
+        }
+        String msg = "当前加入事项已存在！";
+        if (sheetMatterIds.length == 1) {
+            if (success > 0) {
+                msg = "加入事项成功！";
+            }
+        } else if (sheetMatterIds.length > 1) {
+            if (success > 0 && fail == 0) {
+                msg = String.format("加入事项成功%d条!", success);
+            } else if (success > 0 && fail > 0) {
+                msg = String.format("加入事项成功%d条，重复加入事项%d条！", success, fail);
+            } else if (success == 0 && fail > 0) {
+                msg = String.format("重复加入事项%d条！", fail);
             }
-            this.dao.insertBatch(list);
         }
+        return Rest.ok(msg);
+    }
 
+    private Boolean updateOrSave(SheetMatterEntity sheetMatterEntity, Long siteId, Context context) {
+        MatterEntity siteMatterEntity = this.selectOne(new MatterQuery().siteId(siteId).tid(sheetMatterEntity.getTid()));
+        if (ObjectUtils.isEmpty(siteMatterEntity)) {
+            MatterEntity matterEntity = new MatterEntity();
+            matterEntity.setSiteId(siteId);
+            matterEntity.setTid(sheetMatterEntity.getTid());
+            matterEntity.setTcode(sheetMatterEntity.getTcode());
+            matterEntity.setTname(sheetMatterEntity.getTname());
+            matterEntity.setMatterName(sheetMatterEntity.getMatterName());
+            matterEntity.setEnglishName(sheetMatterEntity.getEnglishName());
+            matterEntity.setMatterNo(sheetMatterEntity.getMatterNo());
+            matterEntity.setMatterFullName(sheetMatterEntity.getMatterName());
+            matterEntity.setSource(MatterSourceEnum.AUTO.getValue());
+            matterEntity.setCreateUserId(this.getContextUserId(context));
+            matterEntity.setCreateTime(new Date());
+            this.save(matterEntity, context);
+            return true;
+        }
+        return false;
     }
 
     @Override
     public void recommend(Long id) {
         MatterEntity matterEntity = this.dao.get(id);
-        if(matterEntity==null){
+        if (matterEntity == null) {
             throw new AppException("数据已更改,请重试");
         }
         int recommendCount = paramService.getParamIntValue(ParamKey.MATTER_RECOMMEND_COUNT);
-        Map<String,Object> data = new HashMap<>();
-        Map<String,Object> condition = new HashMap<>();
-        condition.put("id",id);
-        if(matterEntity.getIsRecommend()==0){
-            if(recommendCount>=RECOMMEND_COUNT){
+        Map<String, Object> data = new HashMap<>();
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("id", id);
+        if (matterEntity.getIsRecommend() == 0) {
+            if (recommendCount >= RECOMMEND_COUNT) {
                 throw new AppException("超过推荐个数");
             }
             recommendCount++;
-            data.put("isRecommend",1);
-        }else {
+            data.put("isRecommend", 1);
+        } else {
             recommendCount--;
-            data.put("isRecommend",0);
+            data.put("isRecommend", 0);
         }
-        this.dao.update(data,condition);
-        paramService.setValueByKey(ParamKey.MATTER_RECOMMEND_COUNT,String.valueOf(recommendCount));
+        this.dao.update(data, condition);
+        paramService.setValueByKey(ParamKey.MATTER_RECOMMEND_COUNT, String.valueOf(recommendCount));
     }
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

 package com.mortals.xhx.module.matter.web;
 import com.mortals.framework.common.IBaseEnum;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.common.code.YesNo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
@@ -56,7 +57,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     @Override
     protected void doListBefore(MatterEntity query, Map<String, Object> model, Context context) throws AppException {
         List<OrderCol> orderColList = new ArrayList<>();
-        orderColList.add(new OrderCol("isRecommend"));
+        orderColList.add(new OrderCol("isRecommend",OrderCol.DESCENDING));
         query.setOrderColList(orderColList);
         super.doListBefore(query, model, context);
     }
@@ -68,18 +69,18 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         return super.doListAfter(query, model, context);
     }
 
-
-
     @RequestMapping(value = {"createMatter"},method = {RequestMethod.POST, RequestMethod.GET})
-    public String createMatter(Long[] ids) {
-        Context context = this.getContext();
+    public String createMatter(Long[] ids,Long siteId) {
+//    public String createMatter(Long[] ids) {
         Map<String, Object> model = new HashMap();
         int code = 1;
         String busiDesc = "站点事项转事项";
+
         try {
-            this.service.createMatterbBySheetMatter(ids);
-            model.put("message_info", "站点事项转事项成功!");
-            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + ids + "]");
+            Rest<String> rest = this.service.createMatterbBySheetMatter(ids, siteId, getContext());
+            model.put("message_info", rest.getMsg());
+
+            this.recordSysLog(this.request, rest.getMsg());
         } catch (Exception var7) {
             code = -1;
             this.doException(this.request, busiDesc, model, var7);

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

 package com.mortals.xhx.module.matter.web;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.key.ParamKey;
@@ -15,12 +16,10 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import static com.mortals.framework.ap.SysConstains.*;
@@ -49,6 +48,14 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(MatterDatumEntity query, Map<String, Object> model, Context context) throws AppException {
+        List<OrderCol> orderColList = new ArrayList<>();
+        orderColList.add(new OrderCol("isRecommend",OrderCol.DESCENDING));
+        query.setOrderColList(orderColList);
+        super.doListBefore(query, model, context);
+    }
+
     @Override
     protected int doListAfter(MatterDatumEntity query, Map<String, Object> model, Context context) throws AppException {
         int recommendCount = paramService.getParamIntValue(ParamKey.MATTER_DATUM_RECOMMEND_COUNT);

sample-form-manager/src/test/java/com/mortals/httpclient/system.http

@@ -31,14 +31,12 @@ Content-Type: application/json
 {}
 
 
-###短信设置编辑
-GET {{baseUrl}}/sms/set/edit?id={{SmsSet_id}}
+###添加
+GET {{baseUrl}}/matter/createMatter?ids=37,38,39&siteId=1
+Authorization: {{authToken}}
 Accept: application/json
 
 
-###短信设置删除
-GET {{baseUrl}}/sms/set/delete?id={{SmsSet_id}}
-Accept: application/json