Merge branch 'txb'

tangxiaobao

2021-08-16 92d88fe1dcd963fa866da0e89108d2e99f63eb90

Merge branch 'txb'

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java

@@ -154,7 +154,7 @@
                try {
                    String url = "https://api.weixin.qq.com/cgi-bin/material/batchget_material?access_token=" + token;
                    String result = getActicle(url);
                    log.info("通过token获取文章列表成功,返回结果：" + result);
//                    log.info("通过token获取文章列表成功,返回结果：" + result);

                    JSONObject resultJson = JSON.parseObject(result);
                    if(resultJson != null){

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.listen;

import cn.hutool.core.date.DateException;
import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
@@ -31,6 +32,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -412,10 +414,32 @@
                        vo.setNotPlaceReason(oneData.get(34).trim());
                    }
                    if(StringUtils.isNotEmpty(oneData.get(35))){
                        try {
                        vo.setHelpBegin(DateUtil.parse(oneData.get(35).trim()));
                        } catch (DateException e) {
                            log.info("处理数据时失败");
                            e.printStackTrace();
                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                            index++;
                            setRehabilitationMistake(oneData, mistake);
                            mistake.setMistake("您填写的帮教开始日期有误");
                            mistakes.add(mistake);
                            continue;
                        }
                    }
                    if(StringUtils.isNotEmpty(oneData.get(36))){
                        try {
                        vo.setHelpEnd(DateUtil.parse(oneData.get(36).trim()));
                        } catch (DateException e) {
                            log.info("处理数据时失败");
                            e.printStackTrace();
                            ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
                            index++;
                            setRehabilitationMistake(oneData, mistake);
                            mistake.setMistake("您填写的帮教结束日期有误");
                            mistakes.add(mistake);
                            continue;
                        }
                    }
                    if(StringUtils.isNotEmpty(oneData.get(37))){
                        vo.setHelpSituation(oneData.get(37).trim());

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/pom.xml

@@ -48,11 +48,6 @@
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>swagger-bootstrap-ui</artifactId>
        </dependency>
        <dependency>
            <groupId>com.github.kmood</groupId>
            <artifactId>officeexport-java</artifactId>
            <version>1.0.1.6-RELEASE</version>
        </dependency>
    </dependencies>

    <build>