Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-09 47fe0e855db23220c548fb1d3fe641e18715248a

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -86,7 +86,8 @@
    @GetMapping("/orderdata")
    @Authorization
    public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
                                       @RequestParam(value = "orderNum",required = false)  String orderNum)
                                       @RequestParam(value = "orderNum",required = false)  String orderNum,
                                       @CurrentUser SysUser sysUser)
    {
        if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
        {
@@ -94,7 +95,7 @@
        }

        GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));

        return ResultData.success(order);
    }
@@ -336,7 +337,7 @@
        {
            userId=sysUser.getUserId()+"";
        }
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId);
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId,null,null,null);
        int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -87,7 +87,8 @@
    @GetMapping("/orderdata")
    @Authorization
    public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
                                       @RequestParam(value = "orderNum",required = false)  String orderNum)
                                       @RequestParam(value = "orderNum",required = false)  String orderNum,
                                       @CurrentUser SysUser sysUser)
    {
        if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
        {
@@ -95,7 +96,7 @@
        }

        GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));

        return ResultData.success(order);
    }
@@ -373,6 +374,9 @@
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "matterName",required = false) String matterName,
                                          @RequestParam(value = "status",required = false) String status,
                                          @RequestParam(value = "createTimeStartTime",required = false) String createTimeStartTime,
                                          @RequestParam(value = "createTimeTimeEndTime",required = false) String createTimeTimeEndTime,
                                          @RequestParam(value = "classifyId",required = false)String  classifyId,
                                          @CurrentUser SysUser sysUser)
    {
        Assert.notNull(pageNum, "pageNum 不能为空");
@@ -402,7 +406,7 @@
        }

        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(pageParam,pageSize,
                matterName,ids,status,userId);
                matterName,ids,status,userId,createTimeStartTime,createTimeTimeEndTime,classifyId);
        int num=iGuideRepairOrderService.countConfigList(matterName,ids,status,userId);
        return getDataTable(list,num);
    }

 flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java

@@ -303,11 +303,15 @@
    {
        boolean a = false;
        String fileName = file.getOriginalFilename();
        boolean b = iTransactionEventService.batchImport(fileName, file);
        if (b){
            return  ResultData.success("导入成功");
         Integer b = iTransactionEventService.batchImport(fileName, file);
        if (b == 3) {//
            return ResultData.success("全部导入成功");//全部导入成功
        } else if (b == 2) {
            return ResultData.success("部分导入成功");//部分导入成功
        } else if (b == 0) {
            return ResultData.error("部分失败");//导入失败
        }
        return   ResultData.error("导入失败");
        return ResultData.error("部分失败");//导入失败
    }



 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java

@@ -16,6 +16,12 @@
    public List<GuideEvolveEntity> selectConfigList(String guideId);

    /**
     * 查询记录列表(隐藏工单姓名)
     * @return
     */
    public List<GuideEvolveEntity>  selectHideList(String guideId);

    /**
     * 新增记录
     * @param entity
     * @return

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.data.repository.query.Param;

import java.time.LocalDateTime;
import java.util.List;

/**
@@ -54,7 +55,10 @@
                                            @Param("matterName") String matterName,
                                            @Param("ids") List<String> ids,
                                            @Param("status") String status,
                                            @Param("guideUserId") String guideUserId);
                                            @Param("guideUserId") String guideUserId,
                                            @Param("createTimeStartTime") String createTimeStartTime,
                                            @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
                                            @Param("classifyId") String classifyId);


    /**
@@ -65,7 +69,11 @@
    List<GuideRepairOrder> selectConfigList(@Param("matterName") String matterName,
                                            @Param("ids") List<String> ids,
                                            @Param("status") String status,
                                            @Param("guideUserId") String guideUserId);
                                            @Param("guideUserId") String guideUserId,
                                            @Param("createTimeStartTime") String createTimeStartTime,
                                            @Param("createTimeTimeEndTime") String createTimeTimeEndTime,
                                            @Param("classifyId") String classifyId
                                            );

    /**
     * 获取工单列表(求和)

 flower_city/src/main/java/com/dg/core/service/IGuideEvolveService.java

@@ -2,6 +2,7 @@


import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.SysUser;
import org.springframework.data.repository.query.Param;

import java.util.List;
@@ -12,7 +13,7 @@
     * 查询记录列表
     * @return
     */
    public List<GuideEvolveEntity> selectConfigList(String guideId);
    public List<GuideEvolveEntity> selectConfigList(String guideId, SysUser sysUser);

    /**
     * 新增记录

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -5,6 +5,7 @@
import com.dg.core.db.gen.entity.*;
import org.springframework.data.repository.query.Param;

import java.time.LocalDateTime;
import java.util.List;

public interface IGuideRepairOrderService {
@@ -41,7 +42,8 @@
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                            String matterName,List<String> ids,String status,String guideUserId);
                                            String matterName, List<String> ids, String status, String guideUserId,
                                            String createTimeStartTime, String createTimeTimeEndTime, String classifyId);

    /**
     * 获取工单列表(不分页用于小程序)
@@ -49,7 +51,7 @@
     * @return
     */
    List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
                                            String guideUserId);
                                            String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId);


    /**

 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java

@@ -151,6 +151,6 @@
     * @return
     */
    List<TransactionEvent> selectClassifyList(List<String> ids);
    boolean batchImport(String fileName, MultipartFile file) ;
    Integer batchImport(String fileName, MultipartFile file) ;

}

 flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java

@@ -24,8 +24,13 @@
    private TransactionEventMapper transactionEventMapper;

    @Override
    public List<GuideEvolveEntity> selectConfigList(String guideId) {
        List<GuideEvolveEntity> guideEvolveEntities = baseMapper.selectConfigList(guideId);
    public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
        List<GuideEvolveEntity> guideEvolveEntities;
        if (sysUser.getUserType().equals("3")){
            guideEvolveEntities=baseMapper.selectHideList(guideId);
        }else {
            guideEvolveEntities = baseMapper.selectConfigList(guideId);
        }
        for (GuideEvolveEntity guideEvolveEntity: guideEvolveEntities) {
            String[] split;
            if (guideEvolveEntity.getAccessoryId()!=null){

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -229,14 +229,15 @@
    @Override
    public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                                   String matterName, List<String> ids, String status,
                                                   String guideUserId) {
        return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId);
                                                   String guideUserId, String createTimeStartTime,
                                                   String createTimeTimeEndTime,String classifyId) {
        return baseMapper.selectConfigList(page, state, matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
    }

    @Override
    public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids, String status,
                                                   String guideUserId) {
        return baseMapper.selectConfigList(matterName, ids, status, guideUserId);
                                                   String guideUserId, String createTimeStartTime,String createTimeTimeEndTime,String classifyId) {
        return baseMapper.selectConfigList(matterName, ids, status, guideUserId,createTimeStartTime,createTimeTimeEndTime,classifyId);
    }

    @Override

 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java

@@ -12,9 +12,7 @@
import com.dg.core.service.ITransactionEventService;

import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -100,7 +98,7 @@
    public int deleteConfigById(String Id) {
        List<GuideRepairOrder> guideRepairOrders = guideRepairOrderMapper
                .selectList(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getMatterId, Id));
        if (guideRepairOrders.size() == 0){
        if (guideRepairOrders.size() == 0) {
            return baseMapper.deleteConfigById(Id);
        }
        return 0;
@@ -251,20 +249,19 @@

    @Override
    public List<TransactionEvent> selectList(String keyWord) {
        if (keyWord!=null&&keyWord!=""){
            return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName,keyWord));
        }
        else {
        return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda());
        if (keyWord != null && keyWord != "") {
            return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda().like(TransactionEvent::getMatterName, keyWord));
        } else {
            return baseMapper.selectList(new QueryWrapper<TransactionEvent>().lambda());
        }
    }


    @Override
    public boolean batchImport(String fileName, MultipartFile file)  {
    public Integer batchImport(String fileName, MultipartFile file) {
        boolean notNull = false;
        if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
            throw   new RuntimeException("选择文件格式不正确，请下载模板上传");
            throw new RuntimeException("选择文件格式不正确，请下载模板上传");
        }
        boolean isExcel2003 = true;
        if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
@@ -291,116 +288,127 @@
                throw new RuntimeException(e);
            }
        }
        Integer failNum = 0;//失败数量
        // 获取excel的sheet页数
        int numberOfSheets = wb.getNumberOfSheets();
        //获取excel字段名称进行比较
        Sheet sheetAt = wb.getSheetAt(0);
        Row row1 = sheetAt.getRow(2);
        TransactionEvent transactionEvent = baseMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getMatterName, row1.getCell(1).getStringCellValue()));
        boolean isAdd=false;
        if(transactionEvent==null){
            transactionEvent=new TransactionEvent();
            isAdd=true;
        }
        transactionEvent.setMatterName(row1.getCell(1).getStringCellValue());
        Row row2 = sheetAt.getRow(3);
        transactionEvent.setSetGist("<p>"+row2.getCell(1).getStringCellValue()+"</p>");
        Row row3 = sheetAt.getRow(4);
        Row row4 = sheetAt.getRow(5);
        transactionEvent.setBasicInformation("<p> 事项名称："+row1.getCell(1).getStringCellValue()+"<br />"
            +row3.getCell(0).getStringCellValue()+":"+row3.getCell(1).getStringCellValue()+"<br />"
            +row3.getCell(3).getStringCellValue()+":"+row3.getCell(4).getStringCellValue()+"<br />"
                +row4.getCell(0).getStringCellValue()+":"+row4.getCell(1).getStringCellValue()+"</p>");
        int i=7;
        String applicationMaterial="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("办理途径、条件和注意事项")){
                i=i+2;
                break;
        for (int j = 0; j < numberOfSheets; j++) {
            //获取excel字段名称进行比较
            Sheet sheetAt = wb.getSheetAt(j);
            if(sheetAt.getRow(2)!=null){
            Row row1 = sheetAt.getRow(2);
            TransactionEvent transactionEvent = baseMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getMatterName, new DataFormatter().formatCellValue(row1.getCell(1))));
            boolean isAdd = false;
            if (transactionEvent == null) {
                transactionEvent = new TransactionEvent();
                isAdd = true;
            }
            applicationMaterial=applicationMaterial+"办理区域："+row.getCell(0).getStringCellValue()+"<br />"
                    +"咨询电话："+row.getCell(1).getStringCellValue()+"<br />"
                    +"办公地址："+row.getCell(2).getStringCellValue()+"<br />"
                    +"办公时间："+row.getCell(3).getStringCellValue()+"<br />";
            applicationMaterial=applicationMaterial+"<br />";
            i++;
        }
        applicationMaterial=applicationMaterial+"</p>";
        transactionEvent.setApplicationMaterial(applicationMaterial);
        String acceptConditions="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("（二）网上申报")){
                i=i+1;
                break;
            transactionEvent.setMatterName(new DataFormatter().formatCellValue(row1.getCell(1)));
            Row row2 = sheetAt.getRow(3);
            transactionEvent.setSetGist("<p>" + new DataFormatter().formatCellValue(row2.getCell(1)) + "</p>");
            Row row3 = sheetAt.getRow(4);
            Row row4 = sheetAt.getRow(5);
            transactionEvent.setBasicInformation("<p> 事项名称：" + new DataFormatter().formatCellValue(row1.getCell(1)) + "<br />"
                    + new DataFormatter().formatCellValue(row3.getCell(0)) + ":" + new DataFormatter().formatCellValue(row3.getCell(1))+ "<br />"
                    + new DataFormatter().formatCellValue(row3.getCell(3)) + ":" + new DataFormatter().formatCellValue(row3.getCell(4)) + "<br />"
                    + new DataFormatter().formatCellValue(row4.getCell(0)) + ":" + new DataFormatter().formatCellValue(row4.getCell(1)) + "</p>");
            int i = 7;
            String applicationMaterial = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("办理途径、条件和注意事项")) {
                    i = i + 2;
                    break;
                }
                applicationMaterial = applicationMaterial + "办理区域：" + new DataFormatter().formatCellValue(row.getCell(0)) + "<br />"
                        + "咨询电话：" + new DataFormatter().formatCellValue(row.getCell(1)) + "<br />"
                        + "办公地址：" + new DataFormatter().formatCellValue(row.getCell(2)) + "<br />"
                        + "办公时间：" + new DataFormatter().formatCellValue(row.getCell(3)) + "<br />";
                applicationMaterial = applicationMaterial + "<br />";
                i++;
            }
            acceptConditions=acceptConditions+row.getCell(0).getStringCellValue()+"&nbsp; "
                    +row.getCell(1).getStringCellValue()+"&nbsp; "
                    +row.getCell(2).getStringCellValue()+"&nbsp; ";
            acceptConditions=acceptConditions+"<br />";
            i++;
        }
        acceptConditions=acceptConditions+"</p>";
        transactionEvent.setAcceptConditions(acceptConditions);
        String rates="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("（三）手机移动申报")){
                i=i+1;
                break;
            applicationMaterial = applicationMaterial + "</p>";
            transactionEvent.setApplicationMaterial(applicationMaterial);
            String acceptConditions = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("（二）网上申报")) {
                    i = i + 1;
                    break;
                }
                acceptConditions = acceptConditions + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        +new DataFormatter().formatCellValue( row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
                acceptConditions = acceptConditions + "<br />";
                i++;
            }
            rates=rates+row.getCell(0).getStringCellValue()+"&nbsp; "
                    +row.getCell(1).getStringCellValue()+"&nbsp; "
                    +row.getCell(2).getStringCellValue()+"&nbsp; ";
            rates=rates+"<br />";
            i++;
        }
        rates=rates+"</p>";
        transactionEvent.setRates(rates);
        String transactionArea="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("（四）经营许可（备案）事项程序运行图谱（附电子版）")){
                i=i+1;
                break;
            acceptConditions = acceptConditions + "</p>";
            transactionEvent.setAcceptConditions(acceptConditions);
            String rates = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("（三）手机移动申报")) {
                    i = i + 1;
                    break;
                }
                rates = rates + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
                rates = rates + "<br />";
                i++;
            }
            transactionArea=transactionArea+row.getCell(0).getStringCellValue()+"&nbsp; "
                    +row.getCell(1).getStringCellValue()+"&nbsp; "
                    +row.getCell(2).getStringCellValue()+"&nbsp; ";
            transactionArea=transactionArea+"<br />";
            i++;
        }
        transactionArea=transactionArea+"</p>";
        transactionEvent.setTransactionArea(transactionArea);
        String handlingProcedures="<p>";
        while (true){
            Row row = sheetAt.getRow(i);
            if (row.getCell(0).getStringCellValue().equals("（五）经营许可（备案）事项实施内容一览表（附电子版）")){
                i=i+1;
                break;
            rates = rates + "</p>";
            transactionEvent.setRates(rates);
            String transactionArea = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("（四）经营许可（备案）事项程序运行图谱（附电子版）")) {
                    i = i + 1;
                    break;
                }
                transactionArea = transactionArea + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
                transactionArea = transactionArea + "<br />";
                i++;
            }
            handlingProcedures=handlingProcedures+row.getCell(0).getStringCellValue()+"&nbsp; "
                    +row.getCell(1).getStringCellValue()+"&nbsp; "
                    +row.getCell(2).getStringCellValue()+"&nbsp; ";
            handlingProcedures=handlingProcedures+"<br />";
            i++;
            transactionArea = transactionArea + "</p>";
            transactionEvent.setTransactionArea(transactionArea);
            String handlingProcedures = "<p>";
            while (true) {
                Row row = sheetAt.getRow(i);
                if (row.getCell(0).getStringCellValue().equals("（五）经营许可（备案）事项实施内容一览表（附电子版）")) {
                    i = i + 1;
                    break;
                }
                handlingProcedures = handlingProcedures + new DataFormatter().formatCellValue(row.getCell(0)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(1)) + "&nbsp; "
                        + new DataFormatter().formatCellValue(row.getCell(2)) + "&nbsp; ";
                handlingProcedures = handlingProcedures + "<br />";
                i++;
            }
            handlingProcedures = handlingProcedures + "</p>";
            transactionEvent.setHandlingProcedures(handlingProcedures);
            int ans;
            if (isAdd) {
                ans = baseMapper.insert(transactionEvent);
            } else {
                ans = baseMapper.updateById(transactionEvent);
            }
            if (ans <= 0) {
                failNum++;
            }
            }

        }
        handlingProcedures=handlingProcedures+"</p>";
        transactionEvent.setHandlingProcedures(handlingProcedures);
        int ans;
        if (isAdd){
            ans= baseMapper.insert(transactionEvent);
        }else {
            ans =baseMapper.updateById(transactionEvent);
        if (failNum == 0) {//
            return 3;//全部导入成功
        } else if (failNum < numberOfSheets) {
            return 2;//部分导入成功
        } else if (failNum.equals(numberOfSheets)) {
            return 0;//导入失败
        }
       if (ans>0){
           return  true;
       }
       return  false;
        return 0;
    }




}

 flower_city/src/main/resources/mapper/GuideEvolveMapper.xml

@@ -60,6 +60,42 @@
        order by create_time desc
    </select>

    <select id="selectHideList" resultMap="GuideEvolveResult">
        SELECT
            id,
            departmental_id,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2)),
                    (select user_name from automessage_sys_user where a.to_user_id=user_id))toUserName,
            IFNULL(
                    (select  concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2)),
                    (select user_name from automessage_sys_user where a.from_user_id=user_id))fromUserName,
            to_user_id,
            from_user_id,
            state,
            remark,
            guide_id,
            transaction_id,
            accessory_id,
            accessory_name,
            accessory_url,
            from_departmental_id,
            video_url,
            picture_url,
            create_time,
            update_time,
            guide_order_num,
            is_timeout
        FROM
            automessage_guide_evolve a
        <where>
            <if test="guideId != null and guideId != ''">
                AND guide_id=#{guideId}
            </if>
        </where>
        order by create_time desc
    </select>


    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.GuideEvolveEntity">
        insert into automessage_guide_evolve (

 flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml

@@ -105,6 +105,16 @@
            <if test="status != null and status != ''">
                AND a.state=#{status}
            </if>
            <if test="createTimeStartTime != null and createTimeStartTime != ''">
                and create_time > #{createTimeStartTime}
            </if>
            <if test="createTimeTimeEndTime != null and createTimeTimeEndTime != ''">
               and  #{createTimeTimeEndTime} > create_time
            </if>
            <if test="classifyId != null and classifyId != ''">
                and  classify_id in (select id FROM automessage_classify_administration where  parent_id = #{classifyId})
            </if>

        </where>
        order by  update_time desc ,  create_time desc
    </select>

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

@@ -16,6 +16,7 @@
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.utlis.DateUtils;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -530,4 +531,17 @@
    public R selectAutomessageSysUserById(@RequestParam("id")Long id){
        return communityService.selectAutomessageSysUserById(id);
    }

    @ApiOperation("新增投诉建议或问题留言")
    @PostMapping("addFeedBack")
    public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java

@@ -2,6 +2,7 @@

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
@@ -10,6 +11,7 @@
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -84,5 +86,17 @@
        return R.ok();
    }

    @ApiOperation("新增投诉建议或问题留言")
    @PostMapping("addFeedBack")
    public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
        return userService.addFeedback(sysUserFeedbackDTO);
    }

    @ApiOperation("查看自己的投诉建议或问题留言记录")
    @GetMapping("myFeedBack")
    public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
        return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActProceedingsDTO.java

@@ -69,5 +69,7 @@
     */
    private Date updateBy;

    private String workTime;

    private static final long serialVersionUID = 1L;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java

@@ -37,4 +37,6 @@
    private String phone;

    private String areaCode;

    private Integer type;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java

@@ -50,4 +50,19 @@

    @ApiModelProperty("1投诉建议2问题留言")
    private Integer type;

    @ApiModelProperty("页数")
    private Integer page;

    @ApiModelProperty("每页大小")
    private Integer size;

    @ApiModelProperty("用户昵称")
    private String nickName;

    @ApiModelProperty("用户姓名")
    private String name;

    @ApiModelProperty("电话")
    private String phone;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java

@@ -69,5 +69,8 @@
     */
    private Date updateBy;

    @ApiModelProperty("工作时间")
    private String workTime;

    private static final long serialVersionUID = 1L;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -10563,4 +10563,7 @@

    @GetMapping("/dataCount")
    R dataCount();

    @DeleteMapping("/proceedings/remove")
    R removeProceedings(@RequestParam("id") Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActFeedBackApi.java

New file
@@ -0,0 +1,48 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.SysUserFeedbackVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.PageGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@RestController
@RequestMapping("/feedBack")
@Api(tags = "问题留言和投诉建议")
public class ComActFeedBackApi extends BaseController {
    @Resource
    private UserService userService;

    @ApiOperation(value = "分页查询用户意见反馈", response = SysUserFeedbackVO.class)
    @PostMapping("pagefeedback")
    public R pageFeedback(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO) {
        pageFeedBackDTO.setAreaCode(this.getAreaCode());
        return userService.pageFeedback(pageFeedBackDTO);
    }

    @ApiOperation(value = "反馈意见详情", response = SysUserFeedbackVO.class)
    @GetMapping("feedback")
    public R detailFeedback(@RequestParam("id") Long id) {
        return userService.detailFeedback(id);
    }

    @ApiOperation(value = "删除意见反馈")
    @DeleteMapping("feedback")
    public R deleteFeedback(@RequestParam("id") Long id) {
        return userService.deleteFeedback(id);
    }

    @ApiOperation("回复意见反馈或修改意见反馈回复")
    @PostMapping("feedback")
    public R replyFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){
        return userService.updateFeedBack(sysUserFeedbackVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActPorceedingsApi.java

@@ -6,22 +6,20 @@
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@RestController
@RequestMapping("/proceedings")
@Api(tags = "议事委员会")
@Api(tags = {"议事委员会"})
public class ComActPorceedingsApi {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询议事委员会列表",response = ComActProceedingsVO.class)
    @GetMapping
    public R list(@RequestParam(value = "page",required = false) Integer page,
                  @RequestParam(value = "size",required = false) Integer size,
                  @RequestParam(value = "keyWord",required = false) String keyWord){
@@ -29,10 +27,15 @@
    }

    @ApiOperation("新增或修改议事委员会")
    @PostMapping
    public R addOrUpdate(@RequestBody ComActProceedingsDTO comActProceedingsDTO){
        return communityService.addOrUpdateProceedings(comActProceedingsDTO);
    }


    @DeleteMapping("/{id}")
    @ApiOperation("删除议事委员会")
    public R remove(@PathVariable Long id){
        return communityService.removeProceedings(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyApi.java

@@ -1,9 +1,11 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComActProceedingsDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActProceedingsVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
@@ -31,12 +33,13 @@
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "物业公司列表",response = ComPropertyVO.class)
    @ApiOperation(value = "物业公司列表", response = ComPropertyVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        return this.communityService.comPropertySelectAll(commonPage);
    }

    /**
     * 新增数据
     *

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActProceedingsApi.java

@@ -42,5 +42,9 @@
        return comActProceedingsService.addOrUpdate(comActProceedingsDTO);
    }

     
    @DeleteMapping("/remove")
    public R removeProceedings(@RequestParam("id") Long id){
        return R.ok(comActProceedingsService.removeById(id));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -2710,12 +2710,4 @@
        return automessageSysUserService.selectAutomessageSysUserById(id);
    }


    /**
     * 获取问题清单，需求清单，报道服务活动数量
     * */
    @GetMapping("/dataCount")
    public R dataCount(){
        return null;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java

@@ -441,4 +441,6 @@
    public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone,@RequestParam("communityId")Long communityId){
        return this.comActNeighborCircleService.selectCount(type,phone,communityId);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java

@@ -3,6 +3,7 @@
import java.util.List;

import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import com.panzhihua.common.model.vos.community.DataCount;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java

@@ -2,6 +2,8 @@

import java.io.Serializable;
import java.util.Date;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
@@ -64,6 +66,11 @@
     * 修改人
     */
    private Date updateBy;
   /**
    * 工作时间
    * */
    private String workTime;


    private static final long serialVersionUID = 1L;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java

@@ -5,6 +5,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.DataCount;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -199,4 +200,5 @@
        return R.ok(iPage);
    }


}