1.工单详情附件列表及推荐办事指南显示列表数据2.修改去处理方面的Bug

fengjin

2022-09-29 1db40563cc2157ead8085c651890c39a87b9c83b

1.工单详情附件列表及推荐办事指南显示列表数据2.修改去处理方面的Bug

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

@@ -196,17 +196,18 @@
        {
            return ResultData.error("该工单已办结!");
        }

        if(!StringUtils.equals(order.getState(),"2"))
        {
            return ResultData.error("该工单非是待办状态！");
        if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
            order.setState("2");
            entity.setState("8");
        }
        //待评价
        order.setState("4");
        else if(StringUtils.equals(entity.getState(),"4")){
            //待评价
            order.setState("4");
            entity.setState("9");
        }
        //新增已办结记录
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("4");
        entity.setFromDepartmentalId(sysUser.getDepartmentId());
        entity.setFromUserId(sysUser.getUserId()+"");
        entity.setGuideId(order.getId().toString());

 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java

@@ -13,6 +13,7 @@

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

@Data
@ApiModel("导办工单进展记录表")
@@ -129,4 +130,12 @@
    @ApiModelProperty(name = "toUserName", value = "接收人名字")
    private String fromUserName;

    @TableField(exist = false)
    @ApiModelProperty(name = "elseAccessoryEntities", value = "其他附件列表")
    private List<ElseAccessoryEntity> elseAccessoryEntities;

    @TableField(exist = false)
    @ApiModelProperty(name = "transactionEvents", value = "推荐办事指南列表")
    private List<TransactionEvent> transactionEvents;

}

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

@@ -55,4 +55,11 @@
     */
    public int countNum(String Name);

    /**
     * 按ids查找相关附件列表
     * @param list
     * @return
     */
    List<ElseAccessoryEntity> selectListByIds(String[] list);

}

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

@@ -149,4 +149,11 @@
     * @return
     */
    List<Search> selectSearchAssociate( String keyWord);

    /**
     * 按ids查找导办事务列表
     * @param list
     * @return
     */
    List<TransactionEvent> selectListByIds(String[] list);
}

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

@@ -2,19 +2,41 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.mapper.ElseAccessoryMapper;
import com.dg.core.db.gen.mapper.GuideEvolveMapper;
import com.dg.core.db.gen.mapper.TransactionEventMapper;
import com.dg.core.service.IGuideEvolveService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

@Service
public class GuideEvolveImpl extends ServiceImpl<GuideEvolveMapper, GuideEvolveEntity> implements IGuideEvolveService
{


    @Resource
    private ElseAccessoryMapper elseAccessoryMapper;

    @Resource
    private TransactionEventMapper transactionEventMapper;

    @Override
    public List<GuideEvolveEntity> selectConfigList(String guideId) {
        return baseMapper.selectConfigList(guideId);
        List<GuideEvolveEntity> guideEvolveEntities = baseMapper.selectConfigList(guideId);
        for (GuideEvolveEntity guideEvolveEntity: guideEvolveEntities) {
            String[] split;
            if (guideEvolveEntity.getAccessoryId()!=null){
                split = guideEvolveEntity.getAccessoryId().split(",");
                guideEvolveEntity.setElseAccessoryEntities( elseAccessoryMapper.selectListByIds(split));
            }
            if (guideEvolveEntity.getTransactionId()!=null){
               split=guideEvolveEntity.getTransactionId().split(",");
               guideEvolveEntity.setTransactionEvents(transactionEventMapper.selectListByIds(split));
            }
        }
        return  guideEvolveEntities;
    }

    @Override

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

@@ -35,6 +35,15 @@
        order by create_time desc
    </select>

    <select id="selectListByIds"  resultMap="ElseAccessoryEntityResult">
        <include refid="selectElseAccessoryEntityVo"/>
        WHERE id IN
        <foreach collection="array" item="id" index="index" open="(" close=")" separator=",">
            #{id}
        </foreach>
        order by create_time desc
    </select>


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

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

@@ -129,6 +129,15 @@
        order by create_time desc
    </select>

    <select id="selectListByIds"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventList"/>
        WHERE id IN
        <foreach collection="array" item="id" index="index" open="(" close=")" separator=",">
            #{id}
        </foreach>
        order by create_time desc
    </select>

    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.TransactionEvent">
        insert into automessage_transaction_event (
        <if test="id != null">id,</if>