楚江ERP:客户资信-导出+审核过程中修改资信

@@ -34,6 +34,7 @@
         <maven.compiler.target>8</maven.compiler.target>
         <xingyun.version>1.0.0-SNAPSHOT</xingyun.version>
         <jugg.version>4.0.6</jugg.version>
+        <freemarker.version>2.3.32</freemarker.version>
     </properties>
 
     <dependencyManagement>

@@ -27,5 +27,25 @@
             <artifactId>pinyin4j</artifactId>
             <version>2.5.1</version>
         </dependency>
+        <!-- FreeMarker -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>${freemarker.version}</version>
+        </dependency>
+        <!-- commons-io (可选，用于文件操作) -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+
+        <!-- Lombok（可选） -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

 package com.lframework.xingyun.sc.bo.customer.credit;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
@@ -407,6 +408,13 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> implements BaseD
     private List<CorePersonnel> corePersonnelList;
 
     /**
+     * 核心人员
+     */
+    @ApiModelProperty("核心人员")
+    @JsonIgnore
+    private List<GetCorePersonnelBo> getCorePersonnelBoList;
+
+    /**
      * 创建时间
      */
     @ApiModelProperty("创建时间")

 package com.lframework.xingyun.sc.controller.customer;
 
 import com.lframework.starter.common.utils.StringUtil;
-import com.lframework.starter.mq.core.utils.ExportTaskUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.ExcelUtil;
@@ -16,9 +15,8 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
-import com.lframework.xingyun.sc.enums.ExportType;
-import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditExportTaskWorker;
 import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportListener;
 import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportModel;
 import com.lframework.xingyun.sc.service.customer.CorePersonnelService;
@@ -27,6 +25,7 @@ import com.lframework.xingyun.sc.vo.customer.credit.CreateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
+import freemarker.template.TemplateException;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
@@ -40,6 +39,11 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -232,10 +236,24 @@ public class CustomerCreditController extends DefaultBaseController {
     @ApiOperation("导出")
     @HasPermission({"customer-dev-manage:customer-dev-plan:export"})
     @PostMapping("/export")
-    public InvokeResult<Void> export(@Valid QueryCustomerCreditVo vo) {
-        vo.setExportType(ExportType.CUSTOMER_CREDIT.getCode());
-        ExportTaskUtil.exportTask("客户资信信息", CustomerCreditExportTaskWorker.class, vo);
-        return InvokeResultBuilder.success();
+    public void export(@NotBlank(message = "ID不能为空") String id, HttpServletResponse response) {
+        try {
+            String fileName = customerCreditService.export(id);
+            Path filePath = Paths.get("/web/service/erp/xingyun/export/templates", fileName);
+
+            if (Files.exists(filePath)) {
+                response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+                response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
+
+                Files.copy(filePath, response.getOutputStream());
+            } else {
+                response.sendError(404, "文件未找到");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (TemplateException e) {
+            e.printStackTrace();
+        }
     }
 
 

@@ -118,4 +118,76 @@ public class CorePersonnel extends BaseEntity implements BaseDto {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getNativePlace() {
+        return nativePlace;
+    }
+
+    public void setNativePlace(String nativePlace) {
+        this.nativePlace = nativePlace;
+    }
+
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
 }

@@ -16,6 +16,7 @@ import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.starter.web.inner.vo.system.user.QuerySysUserVo;
+import com.lframework.xingyun.sc.bo.customer.credit.GetCorePersonnelBo;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
 import com.lframework.xingyun.sc.entity.CorePersonnel;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
@@ -47,12 +48,15 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import net.sourceforge.pinyin4j.PinyinHelper;
-
 import javax.annotation.Resource;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -877,6 +881,25 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
     }
 
+    @OpLog(type = OtherOpLogType.class, name = "修改客户资信，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateByMap(Map<String, Object> map) {
+        // 创建 ObjectMapper 实例
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            // 方法1：先将 Map 序列化为 JSON 字符串，再反序列化为目标对象
+            String json = objectMapper.writeValueAsString(map);
+            UpdateCustomerCreditVo updateCustomerCreditVo = objectMapper.readValue(json, UpdateCustomerCreditVo.class);
+            // 使用转换后的对象
+            System.out.println(updateCustomerCreditVo);
+            updateNoFlowInstance(updateCustomerCreditVo);
+
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "修改客户资信表不走审核，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -1149,6 +1172,172 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
             throw new IllegalArgumentException("人员不存在");
         }
     }
+
+    /**
+     * 导出
+     */
+    @Override
+    public String export(String id) throws IOException, TemplateException {
+        // 1. 创建 FreeMarker 配置
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_32);
+
+        // 2.从 classpath 加载 templates 目录（推荐）
+        cfg.setClassLoaderForTemplateLoading(
+                Thread.currentThread().getContextClassLoader(),
+                "templates"  // 对应 src/main/resources/templates/
+        );
+
+        // 3. 设置编码
+        cfg.setDefaultEncoding("UTF-8");
+
+        // 4. 设置异常处理器
+        cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+
+        // 5.加载模板（会自动从 classpath:/templates/CustomerCredit.xml 加载）
+        Template template = cfg.getTemplate("CustomerCredit.xml");
+
+        // 3. 构建数据模型
+//        Map<String, Object> model = new HashMap<>();
+        CustomerCredit credit = getBaseMapper().findById(id);
+        // 处理关联数据
+        GetCustomerCreditBo data = new GetCustomerCreditBo(credit);
+        //获取核心人员信息
+        QueryCorePersonnelVo vo = new QueryCorePersonnelVo();
+        vo.setCreditId(credit.getId());
+        List<CorePersonnel> corePersonnel = corePersonnelService.query(vo);
+        //调查人
+        if (StringUtil.isNotEmpty(credit.getInvestigator())) {
+            SysUser sysUser = sysUserService.findById(credit.getInvestigator());
+            if (sysUser != null) {
+                data.setInvestigatorName(sysUser.getName());
+            }
+        }
+        //主管审核
+        if (StringUtil.isNotEmpty(credit.getSupervisorReview())) {
+            SysUser sysUser = sysUserService.findById(credit.getSupervisorReview());
+            if (sysUser != null) {
+                data.setSupervisorReviewName(sysUser.getName());
+            }
+        }
+//        ObjectMapper mapper = new ObjectMapper();
+//        Map<String, Object> dataModel = mapper.convertValue(data, new TypeReference<Map<String, Object>>() {});
+        Map<String, Object> dataModel = new HashMap<>();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        if (data.getRegisterDate() != null) {
+            String registerDateStr = data.getRegisterDate().format(formatter);
+            dataModel.put("registerDate", registerDateStr);
+        }
+        if (data.getRegistrationTime() != null) {
+            String registrationTimeStr = data.getRegistrationTime().format(formatter);
+            dataModel.put("registrationTime", registrationTimeStr);
+        }
+        if (StringUtil.isNotEmpty(data.getEnterpriseType())) {
+            String enterpriseType;
+            if ("DISTRIBUTOR".equals(data.getEnterpriseType())) {
+                enterpriseType = "经销商";
+            } else {
+                enterpriseType = "终端";
+            }
+            dataModel.put("enterpriseType", enterpriseType);
+        }
+        if (CollectionUtils.isNotEmpty(corePersonnel)) {
+            List<GetCorePersonnelBo> getCorePersonnelBoList = new ArrayList<>();
+            for (CorePersonnel corePersonnel1 : corePersonnel) {
+                // 关键：过滤 null 元素
+                if (corePersonnel1 == null) {
+                    continue; // 跳过 null 值
+                }
+                GetCorePersonnelBo corePersonnelBo = new GetCorePersonnelBo();
+                corePersonnelBo.setName(corePersonnel1.getName());
+                corePersonnelBo.setSex(corePersonnel1.getSex());
+                corePersonnelBo.setNativePlace(corePersonnel1.getNativePlace());
+                corePersonnelBo.setAge(corePersonnel1.getAge());
+                corePersonnelBo.setPosition(corePersonnel1.getPosition());
+                corePersonnelBo.setMobile(corePersonnel1.getMobile());
+                corePersonnelBo.setPhone(corePersonnel1.getPhone());
+                corePersonnelBo.setEmail(corePersonnel1.getEmail());
+                corePersonnelBo.setAddress(corePersonnel1.getAddress());
+                getCorePersonnelBoList.add(corePersonnelBo);
+            }
+            GetCorePersonnelBo corePersonnelBo = getCorePersonnelBoList.get(0);
+            Method getNameMethod = null;
+            try {
+                getNameMethod = corePersonnelBo.getClass().getMethod("getName");
+                System.out.println("✅ getName() 方法存在，修饰符: " + Modifier.toString(getNameMethod.getModifiers()));
+                System.out.println("✅ getName() 返回值: " + getNameMethod.invoke(corePersonnelBo));
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+            dataModel.put("getCorePersonnelBoList", getCorePersonnelBoList);
+            System.out.println("Test getName: " + getCorePersonnelBoList.get(0).getName());
+        }
+        System.out.println("2===" + dataModel.get("getCorePersonnelBoList"));
+
+        // 4. 处理模板 → 生成XML字符串
+        StringWriter stringWriter = new StringWriter();
+        template.process(dataModel, stringWriter);
+        String processedXml = stringWriter.toString();
+        // 1. 定义服务器导出目录
+        String exportDir = "/web/service/erp/xingyun/export/templates";
+        Path dirPath = Paths.get(exportDir);
+        // 2. 创建目录（如果不存在）
+        if (!Files.exists(dirPath)) {
+            Files.createDirectories(dirPath);
+        }
+        // 3. 生成唯一文件名
+        String fileName = "资信报告_" + System.currentTimeMillis() + ".docx";
+        String outputPath = dirPath.resolve(fileName).toString();
+
+        // 5. 重新打包为 .docx
+        rebuildDocx("templates/customerCredit.docx", processedXml, outputPath);
+        return fileName;
+    }
+
+    public void rebuildDocx(String templatePathInClasspath, String processedXml, String outputPath) throws IOException {
+        // 1. 确保输出目录存在
+        Path output = Paths.get(outputPath);
+        Files.createDirectories(output.getParent());
+
+        // 2. 从 classpath 加载模板
+        try (InputStream templateIs = getClass().getClassLoader().getResourceAsStream(templatePathInClasspath)) {
+            if (templateIs == null) {
+                throw new FileNotFoundException("模板文件未找到，请检查路径: " + templatePathInClasspath);
+            }
+
+            // 3. 创建输出文件流
+            try (FileOutputStream fos = new FileOutputStream(outputPath);
+                 ZipOutputStream zos = new ZipOutputStream(fos)) {
+
+                try (ZipInputStream zis = new ZipInputStream(templateIs)) {
+                    ZipEntry entry;
+                    byte[] buffer = new byte[8192];
+
+                    while ((entry = zis.getNextEntry()) != null) {
+                        String entryName = entry.getName();
+                        zos.putNextEntry(new ZipEntry(entryName));
+
+                        if ("word/document.xml".equals(entryName)) {
+                            // 替换为处理后的 XML
+                            zos.write(processedXml.getBytes(StandardCharsets.UTF_8));
+                        } else {
+                            // 其他内容原样复制
+                            int len;
+                            while ((len = zis.read(buffer)) > 0) {
+                                zos.write(buffer, 0, len);
+                            }
+                        }
+                        zos.closeEntry();
+                    }
+                }
+            }
+        }
+
+        System.out.println("文件已生成: " + outputPath);
+    }
     /**
      * 从“XXX办事处”格式的名称中提取前缀拼音首字母，例如：
      * “东莞办事处” → “东莞” → DG

+package com.lframework.xingyun.sc.impl.customer;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.lframework.starter.bpm.service.FlowTaskService;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
+import com.lframework.xingyun.sc.vo.customer.credit.*;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+public class FlowTaskServiceImpl implements FlowTaskService {
+
+    @Resource
+    private CustomerCreditService customerCreditService;
+
+
+    @OpLog(type = OtherOpLogType.class, name = "修改客户资信，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateByMap(Map<String, Object> map) {
+        // 创建 ObjectMapper 实例
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            // 方法1：先将 Map 序列化为 JSON 字符串，再反序列化为目标对象
+            String json = objectMapper.writeValueAsString(map);
+            UpdateCustomerCreditVo updateCustomerCreditVo = objectMapper.readValue(json, UpdateCustomerCreditVo.class);
+            // 使用转换后的对象
+            System.out.println(updateCustomerCreditVo);
+            customerCreditService.updateNoFlowInstance(updateCustomerCreditVo);
+
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+    }
+}

@@ -11,6 +11,7 @@ import freemarker.template.TemplateException;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户资信表 Service
@@ -53,6 +54,13 @@ public interface CustomerCreditService extends BaseMpService<CustomerCredit> {
     /**
      * 修改不走审核流
      *
+     * @param map
+     */
+    void updateByMap(Map<String, Object> map);
+
+    /**
+     * 修改不走审核流
+     *
      * @param vo
      */
     void updateNoFlowInstance(UpdateCustomerCreditVo vo);
@@ -96,4 +104,9 @@ public interface CustomerCreditService extends BaseMpService<CustomerCredit> {
      */
     SysUser getDeptUser();
 
+    /**
+     * 导出
+     */
+    String export(String id) throws IOException, TemplateException;
+
 }