企业端-投诉建议民生诉求代码补充

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/MssqAddOrderBo.java

@@ -1,5 +1,6 @@
 package com.zdxt.enforcementcode.domain.bo;
 
+import com.zdxt.enforcementcode.domain.vo.ZdxtFileVo;
 import lombok.Data;
 
 import java.util.List;
@@ -117,7 +118,7 @@ public class MssqAddOrderBo extends MssqBaseDomainBo {
     /**
      * 上传附件数据集
      */
-    private List<FileDataBo> fileDatas;
+    private List<ZdxtFileVo> fileDatas;
 
 
     /** 工单编码 */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java

@@ -169,4 +169,12 @@ public class AppEnterpriseComplaintBo extends BaseEntity {
      */
     private String detailedAddress;
 
+
+    private List fileListObj;
+
+    /**
+     * 投诉类型
+     */
+    public String enforceTypeText;
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/ZdxtFileVo.java

@@ -156,5 +156,10 @@ public class ZdxtFileVo implements Serializable {
     @ExcelProperty(value = "租户id")
     private String sassId;
 
+    /**
+     * 附件数据流，需要转成Base64编码格式
+     */
+    private String fileBytes ;
+
 
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zdxt.enforcementcode.service.enterprise.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -168,6 +169,20 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain
             }
 
             //原逻辑这边会调用创建民生诉求工单,接口会做后续安排
+            List<String> proCodeList = new ArrayList<>();
+            // 创建民生诉求工单
+            if(StringUtils.isNotEmpty(bo.getComplaintItemCodes())){
+                List<String> codes = Arrays.asList(Convert.toStrArray(bo.getComplaintItemCodes()));
+                codes.forEach(c->{
+                    String prwCode = addMssqOrder(bo, c);
+                    proCodeList.add(prwCode);
+                });
+            }
+            //投诉工单返回参数
+            bo.setProWoCode(String.join(",",proCodeList));
+
+            EnterpriseComplaint updateEntity = MapstructUtils.convert(bo, EnterpriseComplaint.class);
+            baseMapper.updateById(updateEntity);
 
             //上传附件文件
             if(bo.getFileList() != null && !bo.getFileList().isEmpty()){
@@ -187,6 +202,56 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain
         return flag;
     }
 
+    public String  addMssqOrder(AppEnterpriseComplaintBo bo,String itemCode ){
+        try {
+            // 新增民生诉求工单
+            MssqAddOrderBo mssqAddOrder = new MssqAddOrderBo();
+//                执法监督码【企业名称】投诉 + 投诉类型
+            String topic = "";
+            // 通过redId 获取企业名称
+            if (StringUtils.isNotEmpty(bo.getRelId())) {
+
+                EnforcementRegistration regTmp = enforcementRegistrationMapper.selectById(bo.getRelId());
+                topic = "执法监督码【"+ regTmp.getEnterpriseName() +"】投诉 " + bo.getEnforceTypeText();
+
+            } else {
+                topic = "执法监督码投诉 " + bo.getEnforceTypeText();
+            }
+            mssqAddOrder.setRequestTopic(topic);
+            mssqAddOrder.setOrderType(1);
+            mssqAddOrder.setRequestContent(bo.getProblemDescription());
+            mssqAddOrder.setContactName(bo.getLinkman());
+            mssqAddOrder.setContactTel(bo.getLinkmanTel());
+            mssqAddOrder.setRequestArea(bo.getEnterpriseAddress());
+            mssqAddOrder.setRequestFrom(46);
+            mssqAddOrder.setFormUserNature(2);
+            mssqAddOrder.setActCode(itemCode);
+            mssqAddOrder.setIsSecrecy(bo.getAuthorization() != null ? bo.getAuthorization().intValue() : null);
+            if (bo.getFileListObj().size() > 0) {
+                List<ZdxtFileVo> files = new ArrayList<>();
+                for (int z=0; z<bo.getFileListObj().size(); z++) {
+                    HashMap rest = (HashMap) bo.getFileListObj().get(z);
+                    String fl = bo.getFileList().get(z);
+                    String fileName = fl.substring(fl.lastIndexOf("/")+1);
+                    String base64 = rest.get("content").toString();
+                    base64 = base64.replace("data:image/jpeg;base64,","");
+                    ZdxtFileVo fd = new ZdxtFileVo();
+                    fd.setFileName(fileName);
+                    fd.setFileBytes(base64);
+                    files.add(fd);
+                }
+                mssqAddOrder.setFileDatas(files);
+            }
+            String jsonStr = mssqApiService.addMssqOrder(mssqAddOrder);
+            JSONObject json = JSONObject.parseObject(jsonStr);
+            String proWoCode = json.getString("proWoCode");
+            System.out.println("===== 民生诉求新增工单 ====>: "+ jsonStr);
+            return proWoCode;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
     /**
      * 修改企业执法-在线投诉
      *