导入优化

pro-base/src/main/java/com/idea/buildManage/excel/ParkFloorDiscExcel.java

@@ -25,7 +25,7 @@ public class ParkFloorDiscExcel {
     @ExcelProperty(value = "认购金（元）")
     private String subscriptionFunds;
 
-    @ExcelProperty(value = "共持比例")
+    @ExcelProperty(value = "共持比例（%）")
     private String proportion;
 
 //    @ExcelProperty(value = "支付方式")

pro-base/src/main/java/com/idea/buildManage/excel/ParkInfoListener.java

@@ -61,6 +61,8 @@ public class ParkInfoListener extends AnalysisEventListener<ParkInfoExcel> {
         List<Map<String, String>> saleStatus = sysDictService.selectDictList("SALE_STATUS");
         // 公司名称
         List<Map<String, String>> companyNames = sysDictService.selectDictList("COMPANY_NAME");
+        // 行政区划
+        List<Map<String, String>> codes = sysDictService.selectDictList("REGIONALISM_CODE");
         // 预售许可证编号
         Map<String, String> numberIdMap = parkInfoService.getNumberIdMap();
 
@@ -92,6 +94,7 @@ public class ParkInfoListener extends AnalysisEventListener<ParkInfoExcel> {
                 boolean areaStatusFlag = true;
                 boolean saleStatusFlag = true;
                 boolean duplicateFlag = true;
+                boolean regionalismCodeFlag = true;
                 StringBuilder builder = new StringBuilder();
                 try {
                     data = new ParkInfo();
@@ -187,10 +190,27 @@ public class ParkInfoListener extends AnalysisEventListener<ParkInfoExcel> {
                                 excel.setSaleStatus("{" + excel.getSaleStatus() + "}");
                             }
                         }
+
+                        // 行政区划
+                        if (StringUtils.isNotEmpty(excel.getRegionalismCode())) {
+                            for (Map<String, String> stringStringMap : codes) {
+                                if (stringStringMap.get("label").equals(excel.getRegionalismCode())) {
+                                    data.setRegionalismCode(stringStringMap.get("value"));
+                                }
+                            }
+                            // 没匹配上的情况
+                            if (data.getRegionalismCode() == null) {
+                                regionalismCodeFlag = false;
+                                builder.append("行政区划有误").append(",");
+                                excel.setRegionalismCode("{" + excel.getRegionalismCode() + "}");
+                            }
+                        }
+
+
                     }
 
                     if (groupNameFlag && natureFlag && preSalesLicenseNumberFlag && companyNameFlag && areaStatusFlag
-                            && saleStatusFlag && duplicateFlag
+                            && saleStatusFlag && duplicateFlag && regionalismCodeFlag
                     ) {
                         String[] IGNORE_ISOLATOR_PROPERTIES = new String[]{"groupName", "nature", "preSalesLicenseNumber", "areaStatus", "saleStatus"};
                         BeanUtil.copyProperties(excel, data, IGNORE_ISOLATOR_PROPERTIES);

pro-base/src/main/java/com/idea/customerManagement/controller/CustomerManagementController.java

@@ -137,4 +137,11 @@ public class CustomerManagementController extends BaseController {
         modelService.errorListExport(list,response);
     }
 
+
+    @PostMapping(value = "downLoadTemplate")
+    @ResponseBody
+    public void downLoadTemplate(HttpServletResponse response) throws IOException {
+        modelService.downLoadTemplate(response);
+    }
+
 }

pro-base/src/main/java/com/idea/customerManagement/excel/CustomerManagementExcel.java

@@ -16,22 +16,22 @@ public class CustomerManagementExcel {
     @ExcelProperty(value = "分期名称")
     private String discName;
 
-    @ExcelProperty(value = "选房日")
+    @ExcelProperty(value = "*选房日（年-月-日 时:分:秒)")
     private String roomSelectionDate;
 
-    @ExcelProperty(value = "批次号")
+    @ExcelProperty(value = "*批次号")
     private String batchNumber;
 
-    @ExcelProperty(value = "选房号")
+    @ExcelProperty(value = "*选房号")
     private String roomSelectionNumber;
 
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "*购房1-姓名")
     private String buyerName;
 
-    @ExcelProperty(value = "身份证号")
+    @ExcelProperty(value = "*购房1-身份证号")
     private String identityCard;
 
-    @ExcelProperty(value = "手机号")
+    @ExcelProperty(value = "*购房1-手机号")
     private String phone;
 
     @ExcelProperty(value = "关系")
@@ -43,13 +43,14 @@ public class CustomerManagementExcel {
     @ExcelProperty(value = "失败原因")
     private String reason;
 
-//    @ExcelIgnore
-//    private List<Buyer> buyers;
+    @ExcelIgnore
+    private List<Buyer> buyers;
 
     @ExcelIgnore
     private String relationshipStr;
 
-
+    @ExcelIgnore
+    private Boolean duplicate;
 
 
 }

pro-base/src/main/java/com/idea/oa/flow2/controller/FlowMainController.java

@@ -25,6 +25,10 @@ import com.idea.oa.flow2.service.FlowMainService;
 //import com.idea.oa.outsource.model.OutOrderPayExample;
 //import com.idea.oa.outsource.service.OutOrderMainService;
 //import com.idea.oa.outsource.service.OutOrderPayService;
+import com.idea.workPanel.enume.HandleTypeEnum;
+import com.idea.workPanel.mapper.ParkWaitHandleMapper;
+import com.idea.workPanel.model.ParkWaitHandle;
+import com.idea.workPanel.model.ParkWaitHandleExample;
 import com.rockstar.common.base.BaseController;
 import com.rockstar.common.domain.AjaxResult;
 import com.rockstar.flow.exception.FlowException;
@@ -88,6 +92,8 @@ public class FlowMainController extends BaseController {
 //    private OutOrderMainService outOrderMainService;
 //    @Autowired
 //    private OutOrderPayService outOrderPayService;
+@Autowired
+    private ParkWaitHandleMapper parkWaitHandleMapper;
 
 
     /**
@@ -541,7 +547,27 @@ public class FlowMainController extends BaseController {
                 flowMainPushService.insert(newflowMainPush);
             }
 
+            // TODO: 2024/12/12 修改待办receive_user
+            FlowMain flowMain = modelService.selectByPrimaryKey(flowMainPush.getFlowMainId());
+            // 进行审核操作后 就要处理待办 清除数据
+            String param = "id=" + flowMain.getId() + "&flowMainPushId=" + entity.getFlowMainPushId() + "&applyUser=" + flowMain.getApplyUser();
+            // 付款申请
+            if(flowMain.getFlowType().equals(ConstantFlowType.PAYMENT)){
+                ParkWaitHandleExample parkWaitHandleExample = new ParkWaitHandleExample();
+                parkWaitHandleExample.createCriteria().andRouteParamEqualTo(param);
+                List<ParkWaitHandle> handleList = parkWaitHandleMapper.selectByExample(parkWaitHandleExample);
+                if(CollectionUtils.isNotEmpty(handleList)){
+                    ParkWaitHandle handle = handleList.get(0);
+                    handle.setReceiveUserId(entity.getPushEntrustId());
+                    parkWaitHandleMapper.updateByPrimaryKeySelective(handle);
+                }
+            }
+
         }
+
+
+
+
         return result(1);
     }
 //=====下面是查询=============================================================================================

pro-base/src/main/java/com/idea/oa/flow2/service/FlowMainService.java

@@ -15,6 +15,8 @@ import com.idea.oa.flow2.model.in.FlowMainIn;
 import com.idea.oa.flow2.model.in.TargetUserAndFlowRole;
 import com.idea.oa.flow2.model.out.FlowHistoryInfo;
 import com.idea.oa.flow2.model.out.IMGFlowHistoryInfo;
+import com.idea.workPanel.enume.HandleTypeEnum;
+import com.idea.workPanel.service.ParkWaitHandleService;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.common.domain.AjaxResult;
 import com.rockstar.common.support.Convert;
@@ -26,9 +28,11 @@ import com.rockstar.frame.model.extend.Tablepar;
 import com.rockstar.frame.service.FrameUserService;
 import com.rockstar.shiro.util.ShiroUtils;
 import com.rockstar.util.UUIDUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.activiti.bpmn.model.UserTask;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
@@ -40,6 +44,7 @@ import java.math.BigDecimal;
 import java.math.MathContext;
 import java.util.*;
 
+@Slf4j
 @Service
 public class FlowMainService implements BaseService<FlowMain, FlowMainExample> {
 
@@ -64,6 +69,8 @@ public class FlowMainService implements BaseService<FlowMain, FlowMainExample> {
     private FlowMainLogService flowMainLogService;
     @Autowired
     private FlowMainCcService flowMainCcService;
+    @Autowired
+    private ParkWaitHandleService parkWaitHandleService;
 
     /**
      * 添加审核结果
@@ -1187,6 +1194,32 @@ public class FlowMainService implements BaseService<FlowMain, FlowMainExample> {
         if (!flowMain.getFlowStatus().equals(1)) {
             return AjaxResult.error("流程状态不在审核中,请重新确认");
         }
+
+        // TODO: 2024/12/12  先处理待办 不然状态 会变
+        try {
+
+            // 撤回后处理待办
+            String flowId = flowMain.getId();
+            FlowMainPushExample flowMainPushExample = new FlowMainPushExample();
+            flowMainPushExample.createCriteria().andFlowMainIdEqualTo(flowId).andStatusEqualTo(0);
+            List<FlowMainPush> flowMainPushes = flowMainPushService.selectByExample(flowMainPushExample);
+            if (CollectionUtils.isNotEmpty(flowMainPushes)) {
+                FlowMainPush push = flowMainPushes.get(0);
+                // 进行审核操作后 就要处理待办 清除数据
+                String param = "id=" + flowId + "&flowMainPushId=" + push.getId() + "&applyUser=" + flowMain.getApplyUser();
+                // 付款申请
+                if(flowMain.getFlowType().equals(ConstantFlowType.PAYMENT)){
+                    parkWaitHandleService.userHandle(HandleTypeEnum.FK, param, ShiroUtils.getUserId());
+                }
+            }
+
+        }catch (Exception e){
+            log.error("撤回流程处理待办报错:",e);
+        }
+        
+        
+        
+        
         String mypushUserKey = null;
         {//开始申请人撤回申请
             //先搜索目前有哪些人在审核中 ,获取key

pro-base/src/main/java/com/idea/util/ExcelUtils.java

@@ -54,6 +54,15 @@ public class ExcelUtils<E> {
         return EasyExcel.read(inputStream).head(clazz).sheet().doReadSync();
     }
 
+    /**
+     * @param inputStream 前端传输文件的输入流
+     * @param clazz       读取表格转换的对象class
+     * @return
+     */
+    public List<E> excelImport(InputStream inputStream, Class<?> clazz, int headRowNumber) {
+        return EasyExcel.read(inputStream).headRowNumber(headRowNumber).head(clazz).sheet().doReadSync();
+    }
+
     /**
      * @param inputStream 前端传输文件的输入流
      * @param clazz       读取表格转换的对象class

pro-base/src/main/java/com/idea/util/OAUtil.java

@@ -29,24 +29,24 @@ public class OAUtil {
 
     public static String receiveRequestInfoByJson(Map<String,Object>  parma) {
 
-        String url = prefix + "/rest/ofs/ReceiveRequestInfoByJson";
-        String body = JSON.toJSONString(parma);
-        // 发送POST请求
-        HttpResponse response = HttpRequest.post(url)
-                .header(headers)
-                .body(body)
-                .execute();
-
-        System.out.println("请求参数:" + JSON.toJSONString(parma));
-        // 获取响应状态码
-        int statusCode = response.getStatus();
-//        System.out.println("Status Code: " + statusCode);
-
-        // 获取响应体
-        String responseBody = response.body();
-//        System.out.println("Response Body: " + responseBody);
-        return responseBody;
-//        return null;
+//        String url = prefix + "/rest/ofs/ReceiveRequestInfoByJson";
+//        String body = JSON.toJSONString(parma);
+//        // 发送POST请求
+//        HttpResponse response = HttpRequest.post(url)
+//                .header(headers)
+//                .body(body)
+//                .execute();
+//
+//        System.out.println("请求参数:" + JSON.toJSONString(parma));
+//        // 获取响应状态码
+//        int statusCode = response.getStatus();
+////        System.out.println("Status Code: " + statusCode);
+//
+//        // 获取响应体
+//        String responseBody = response.body();
+////        System.out.println("Response Body: " + responseBody);
+//        return responseBody;
+        return null;
     }
 
     public static void main(String[] args) {

pro-base/src/main/resources/mybatis/paymentManagement/PayLogExtendMapper.xml

@@ -43,11 +43,11 @@
            ifnull(contract_manage.buyer_money - sum(pay_log.pay_money),0) arrears
     from contract_manage
     left join pay_log on contract_manage.id = pay_log.contract_id
-    and pay_log.pay_type = #{payType} and pay_log.content_type != 7
+    and pay_log.pay_type = #{payType} and pay_log.content_type != 7 and pay_log.status = 0
     <where>
       and contract_status in (2,3)
       <if test="houseName != null and houseName != ''">
-        and house_name like concat('%',#{houseName},'%')
+        and contract_manage.house_name like concat('%',#{houseName},'%')
       </if>
       <if test="collectionStatus != null and collectionStatus != ''">
         and collection_status = #{collectionStatus}

pro-base/src/main/resources/mybatis/paymentManagement/RefundManageExtendMapper.xml

@@ -14,7 +14,7 @@
     left join contract_manage on contract_manage.id = refund_manage.contract_id
     <where>
       <if test="houseName != null and houseName != ''">
-        and house_name like concat('%',#{houseName},'%')
+        and contract_manage.house_name like concat('%',#{houseName},'%')
       </if>
       <if test="refundDateFrom != null and refundDateFrom != ''">
         and date_format(refund_manage.created_at, '%Y-%m-%d') &gt;= #{refundDateFrom}