报修设置加入办理时长和超时预警功能

wuxw

2025-03-27 ad3bee0c54c3775284fa542127b965ac63cbb911

报修设置加入办理时长和超时预警功能

 java110-bean/src/main/java/com/java110/dto/repair/RepairSettingDto.java

@@ -39,6 +39,9 @@

    private String notifyWay;

    private int doTime;
    private int warningTime;

    public String getRepairTypeName() {
        return repairTypeName;
    }
@@ -198,4 +201,20 @@
    public void setCommunityIds(String[] communityIds) {
        this.communityIds = communityIds;
    }

    public int getDoTime() {
        return doTime;
    }

    public void setDoTime(int doTime) {
        this.doTime = doTime;
    }

    public int getWarningTime() {
        return warningTime;
    }

    public void setWarningTime(int warningTime) {
        this.warningTime = warningTime;
    }
}

 java110-bean/src/main/java/com/java110/po/repair/RepairSettingPo.java

@@ -19,6 +19,9 @@

    private String notifyWay;

    private int doTime;
    private int warningTime;

    public String getRepairTypeName() {
        return repairTypeName;
    }
@@ -130,4 +133,20 @@
    public void setNotifyWay(String notifyWay) {
        this.notifyWay = notifyWay;
    }

    public int getDoTime() {
        return doTime;
    }

    public void setDoTime(int doTime) {
        this.doTime = doTime;
    }

    public int getWarningTime() {
        return warningTime;
    }

    public void setWarningTime(int warningTime) {
        this.warningTime = warningTime;
    }
}

 java110-db/src/main/resources/mapper/community/RepairSettingServiceDaoImplMapper.xml

File was deleted

 java110-db/src/main/resources/mapper/community/RepairSettingV1ServiceDaoImplMapper.xml

@@ -7,19 +7,33 @@
    <insert id="saveRepairSettingInfo" parameterType="Map">
        insert into r_repair_setting(price_scope, pay_fee_flag, return_visit_flag, repair_type_name, repair_type,
                                     remark, community_id, public_area, repair_way, repair_setting_type, setting_id,
                                     is_show,notify_way)
                                     is_show,notify_way,do_time,warning_time)
        values (#{priceScope}, #{payFeeFlag}, #{returnVisitFlag}, #{repairTypeName}, #{repairType}, #{remark},
                #{communityId}, #{publicArea}, #{repairWay}, #{repairSettingType}, #{settingId}, #{isShow},#{notifyWay})
                #{communityId}, #{publicArea}, #{repairWay}, #{repairSettingType}, #{settingId}, #{isShow},#{notifyWay}
        , #{doTime},#{warningTime}
        )
    </insert>
    <!-- 查询报修设置信息 add by wuxw 2018-07-03 -->
    <select id="getRepairSettingInfo" parameterType="Map" resultType="Map">
        select t.price_scope priceScope,t.pay_fee_flag
        payFeeFlag,t.return_visit_flag returnVisitFlag,t.repair_type_name
        repairTypeName,t.repair_type repairType,t.remark,t.status_cd
        statusCd,t.community_id communityId,t.public_area publicArea,t.repair_way repairWay,t.repair_setting_type
        repairSettingType,t.setting_id settingId,t.is_show isShow,t.notify_way notifyWay
        select t.repair_type_name,t.repair_type_name repairTypeName,t.repair_type,t.repair_type
        repairType,t.repair_setting_type,t.repair_setting_type repairSettingType,t.remark,t.status_cd,t.status_cd
        statusCd,t.b_id,t.b_id bId,t.community_id,t.community_id
        communityId,t.repair_way,t.repair_way repairWay,t.setting_id,t.setting_id settingId,t.create_time
        createTime,d.name repairWayName,d2.name repairSettingTypeName,
        t.public_area,t.public_area publicArea,t.pay_fee_flag,t.pay_fee_flag payFeeFlag
        ,t.price_scope,t.price_scope priceScope,t.return_visit_flag,t.return_visit_flag returnVisitFlag,d1.name
        returnVisitFlagName,t.is_show,t.is_show isShow,t.notify_way notifyWay,t.do_time doTime,t.warning_time warningTime
        from r_repair_setting t
        left join t_dict d on t.repair_way = d.status_cd and d.table_name = 'r_repair_setting' and d.table_columns
        ='repair_way'
        left join t_dict d1 on t.return_visit_flag = d1.status_cd and d1.table_name = 'r_repair_setting' and
        d1.table_columns = 'return_visit_flag'
        left join t_dict d2 on t.repair_setting_type = d2.status_cd and d2.table_name = 'r_repair_setting' and
        d2.table_columns = 'repair_setting_type'
        where 1 =1
        <if test="repairTypeName !=null and repairTypeName != ''">
            and t.repair_type_name like '%${repairTypeName}%'
        </if>
        <if test="priceScope !=null and priceScope != ''">
            and t.price_scope= #{priceScope}
        </if>
@@ -108,6 +122,12 @@
        <if test="notifyWay !=null and notifyWay != ''">
            , t.notify_way= #{notifyWay}
        </if>
        <if test="doTime !=null and doTime != ''">
            , t.do_time= #{doTime}
        </if>
        <if test="warningTime !=null and warningTime != ''">
            , t.warning_time= #{warningTime}
        </if>
        where 1=1
        <if test="settingId !=null and settingId != ''">
            and t.setting_id= #{settingId}

 java110-interface/src/main/java/com/java110/intf/community/IRepairSettingInnerServiceSMO.java

File was deleted

 java110-interface/src/main/java/com/java110/intf/community/IRepairSettingV1InnerServiceSMO.java

@@ -39,13 +39,13 @@


    @RequestMapping(value = "/saveRepairSetting", method = RequestMethod.POST)
    public int saveRepairSetting(@RequestBody RepairSettingPo repairSettingPo);
     int saveRepairSetting(@RequestBody RepairSettingPo repairSettingPo);

    @RequestMapping(value = "/updateRepairSetting", method = RequestMethod.POST)
    public int updateRepairSetting(@RequestBody  RepairSettingPo repairSettingPo);
     int updateRepairSetting(@RequestBody  RepairSettingPo repairSettingPo);

    @RequestMapping(value = "/deleteRepairSetting", method = RequestMethod.POST)
    public int deleteRepairSetting(@RequestBody  RepairSettingPo repairSettingPo);
     int deleteRepairSetting(@RequestBody  RepairSettingPo repairSettingPo);

    /**
     * <p>查询小区楼信息</p>

 service-community/src/main/java/com/java110/community/cmd/repair/ListRepairSettingsCmd.java

@@ -21,7 +21,7 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.repair.RepairSettingDto;
import com.java110.intf.community.IRepairSettingInnerServiceSMO;
import com.java110.intf.community.IRepairSettingV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -51,7 +51,7 @@
    private static Logger logger = LoggerFactory.getLogger(ListRepairSettingsCmd.class);

    @Autowired
    private IRepairSettingInnerServiceSMO repairSettingInnerServiceSMOImpl;
    private IRepairSettingV1InnerServiceSMO repairSettingV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -64,12 +64,12 @@

        RepairSettingDto repairSettingDto = BeanConvertUtil.covertBean(reqJson, RepairSettingDto.class);

        int count = repairSettingInnerServiceSMOImpl.queryRepairSettingsCount(repairSettingDto);
        int count = repairSettingV1InnerServiceSMOImpl.queryRepairSettingsCount(repairSettingDto);

        List<RepairSettingDto> repairSettingDtos = null;

        if (count > 0) {
            repairSettingDtos = repairSettingInnerServiceSMOImpl.queryRepairSettings(repairSettingDto);
            repairSettingDtos = repairSettingV1InnerServiceSMOImpl.queryRepairSettings(repairSettingDto);
        } else {
            repairSettingDtos = new ArrayList<>();
        }

 service-community/src/main/java/com/java110/community/cmd/repair/SaveRepairSettingCmd.java

@@ -60,6 +60,8 @@
        Assert.hasKeyAndValue(reqJson, "publicArea", "请求报文中未包含公共区域");
        Assert.hasKeyAndValue(reqJson, "payFeeFlag", "请求报文中未包含收费情况");
        Assert.hasKeyAndValue(reqJson, "returnVisitFlag", "请求报文中未包含回访设置");
        Assert.hasKeyAndValue(reqJson, "doTime", "请求报文中未包含办理时长");
        Assert.hasKeyAndValue(reqJson, "warning", "请求报文中未包含超时预警");

    }


 service-community/src/main/java/com/java110/community/dao/IRepairSettingServiceDao.java

File was deleted

 service-community/src/main/java/com/java110/community/dao/impl/RepairSettingServiceDaoImpl.java

File was deleted

 service-community/src/main/java/com/java110/community/dao/impl/RepairSettingV1ServiceDaoImpl.java

@@ -21,6 +21,7 @@
import com.java110.utils.util.DateUtil;
import com.java110.core.base.dao.BaseServiceDao;
import com.java110.community.dao.IRepairSettingV1ServiceDao;
import com.java110.utils.util.ListUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -71,9 +72,9 @@
    public List<Map> getRepairSettingInfo(Map info) throws DAOException {
        logger.debug("查询 getRepairSettingInfo 入参 info : {}",info);

        List<Map> businessRepairSettingInfos = sqlSessionTemplate.selectList("repairSettingV1ServiceDaoImpl.getRepairSettingInfo",info);
        List<Map> infos = sqlSessionTemplate.selectList("repairSettingV1ServiceDaoImpl.getRepairSettingInfo",info);

        return businessRepairSettingInfos;
        return infos;
    }


@@ -100,12 +101,12 @@
    public int queryRepairSettingsCount(Map info) {
        logger.debug("查询 queryRepairSettingsCount 入参 info : {}",info);

        List<Map> businessRepairSettingInfos = sqlSessionTemplate.selectList("repairSettingV1ServiceDaoImpl.queryRepairSettingsCount", info);
        if (businessRepairSettingInfos.size() < 1) {
        List<Map> infos = sqlSessionTemplate.selectList("repairSettingV1ServiceDaoImpl.queryRepairSettingsCount", info);
        if (ListUtil.isNull(infos)) {
            return 0;
        }

        return Integer.parseInt(businessRepairSettingInfos.get(0).get("count").toString());
        return Integer.parseInt(infos.get(0).get("count").toString());
    }



 service-community/src/main/java/com/java110/community/smo/impl/RepairSettingInnerServiceSMOImpl.java

File was deleted

 service-job/src/main/java/com/java110/job/adapt/Repair/MachineReturnRepairAdapt.java

@@ -19,7 +19,7 @@
import com.java110.dto.wechat.PropertyFeeTemplateMessage;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.community.IRepairSettingInnerServiceSMO;
import com.java110.intf.community.IRepairSettingV1InnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
@@ -82,7 +82,7 @@
    private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMO;

    @Autowired
    private IRepairSettingInnerServiceSMO repairSettingInnerServiceSMO;
    private IRepairSettingV1InnerServiceSMO repairSettingV1InnerServiceSMO;

    @Autowired
    private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMO;
@@ -161,7 +161,7 @@
        String repairType = repairDtos.get(0).getRepairType();
        RepairSettingDto repairSettingDto = new RepairSettingDto();
        repairSettingDto.setSettingId(repairType);
        List<RepairSettingDto> repairSettingDtos = repairSettingInnerServiceSMO.queryRepairSettings(repairSettingDto);
        List<RepairSettingDto> repairSettingDtos = repairSettingV1InnerServiceSMO.queryRepairSettings(repairSettingDto);
        Assert.listOnlyOne(repairSettingDtos, "信息错误");
        JSONObject paramIn = new JSONObject();
        if (RepairUserDto.STATE_BACK.equals(state)) {   //退单状态

 service-job/src/main/java/com/java110/job/task/repair/ReturnVisitRepairTemplate.java

@@ -7,7 +7,7 @@
import com.java110.dto.repair.RepairUserDto;
import com.java110.dto.task.TaskDto;
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.community.IRepairSettingInnerServiceSMO;
import com.java110.intf.community.IRepairSettingV1InnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
import com.java110.po.owner.RepairPoolPo;
@@ -16,6 +16,7 @@
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
@@ -46,7 +47,8 @@
    private IRepairUserInnerServiceSMO repairUserInnerServiceSMO;

    @Autowired
    private IRepairSettingInnerServiceSMO repairSettingInnerServiceSMO;
    private IRepairSettingV1InnerServiceSMO repairSettingV1InnerServiceSMO;


    @Override
    protected void process(TaskDto taskDto) {
@@ -117,7 +119,7 @@
            //查询报修工单信息
            RepairSettingDto repairSettingDto = new RepairSettingDto();
            repairSettingDto.setSettingId(repairDtos.get(0).getRepairType());
            List<RepairSettingDto> repairSettingDtos = repairSettingInnerServiceSMO.queryRepairSettings(repairSettingDto);
            List<RepairSettingDto> repairSettingDtos = repairSettingV1InnerServiceSMO.queryRepairSettings(repairSettingDto);
            if (repairSettingDtos == null || repairSettingDtos.size() != 1) {
                return;
            }
@@ -171,14 +173,14 @@
            repairDto.setRepairId(tmpRepairDto.getRepairId());
            //查询报修信息
            List<RepairDto> repairDtos = repairInnerServiceSMOImpl.queryRepairs(repairDto);
            if (repairDtos == null || repairDtos.size() != 1) {
            if (ListUtil.isNull(repairDtos)) {
                return;
            }
            //查询报修工单信息
            RepairSettingDto repairSettingDto = new RepairSettingDto();
            repairSettingDto.setSettingId(repairDtos.get(0).getRepairType());
            List<RepairSettingDto> repairSettingDtos = repairSettingInnerServiceSMO.queryRepairSettings(repairSettingDto);
            if (repairSettingDtos == null || repairSettingDtos.size() != 1) {
            List<RepairSettingDto> repairSettingDtos = repairSettingV1InnerServiceSMO.queryRepairSettings(repairSettingDto);
            if (ListUtil.isNull(repairSettingDtos)) {
                return;
            }
            //获取报修区域