修改Bug

fengjin

2022-10-09 99c990b862429e4d3ce97c271a911831d06f815e

修改Bug

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

@@ -254,9 +254,11 @@
        guideEvolveEntity.setState("3");
        guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
        guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
        iGuideEvolveService.insertConfig(guideEvolveEntity);

        return toAjax(iGuideRepairOrderService.updateConfig(entity));
        int i = iGuideRepairOrderService.updateConfig(entity);
        if (i>0)
            return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
        else
            return ResultData.error();
    }

    /**

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

@@ -36,7 +36,6 @@
     */
    @ApiOperation("查询导办事务详情")
    @GetMapping("/getData")
    @Authorization
    public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
    {
        Assert.notNull(Id, "Id 不能为空");

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

@@ -305,9 +305,11 @@
        guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
        guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
        guideEvolveEntity.setGuideId(entity.getId().toString());
        iGuideEvolveService.insertConfig(guideEvolveEntity);

        return toAjax(iGuideRepairOrderService.updateConfig(entity));
        int i = iGuideRepairOrderService.updateConfig(entity);
        if (i>0)
            return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
        else
            return ResultData.error();
    }

    /**

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

@@ -41,7 +41,7 @@
     */
    @ApiOperation("查询导办事务详情")
    @GetMapping("/getData")
    @Authorization

    public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
    {
        Assert.notNull(Id, "Id 不能为空");

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

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

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

@Service
@@ -26,6 +27,7 @@

    @Override
    public List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId){
//        HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
        TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
                eq(TransactionEvent::getId, transactionId));
        OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()

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

@@ -37,6 +37,7 @@
        guideRepairOrder.setMatterName(transactionEvent.getMatterName());
        guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
        guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
        sysUserMapper.selectListByDepartmentId(null, "," + guideRepairOrder.getMatterId(), guideRepairOrder.getMatterId() + ",")
        guideRepairOrder.setState("1");
        guideRepairOrder.setCreateTime(LocalDateTime.now());
        guideRepairOrder.setUpdateTime(LocalDateTime.now());

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

@@ -38,6 +38,8 @@
    @Override
    public TransactionEvent selectConfigData(String Id,SysUser sysUser) {
        TransactionEvent transactionEvent = baseMapper.selectConfigData(Id);
        //如果当前没有登录用户则不增加浏览次数
        if (sysUser!=null){
        LocalDateTime startTime = LocalDate.now().atTime(0, 0, 0);
        LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);
        AutomessageTransactionEventInterview automessageTransactionEventInterview = automessageTransactionEventInterviewMapper.selectOne(new QueryWrapper<AutomessageTransactionEventInterview>()
@@ -46,7 +48,7 @@
                .orderByDesc(AutomessageTransactionEventInterview::getInterviewTime)
                .last("limit 1"));
        transactionEvent.setQueryTime(LocalDateTime.now());
        //判断上次访问时间是不是今天 如果
            //判断上次访问时间是不是今天 如果是今天不增加浏览次数
        if (automessageTransactionEventInterview==null||(!(transactionEvent.getQueryTime().isAfter(startTime)&&transactionEvent.getQueryTime().isBefore(endTime)))) {
            transactionEvent.setBrowseNum(transactionEvent.getBrowseNum()+1);
            baseMapper.updateById(transactionEvent);
@@ -57,6 +59,7 @@
            automessageTransactionEventInterviewNew.setInterviewTime(LocalDateTime.now());
            automessageTransactionEventInterviewMapper.insert(automessageTransactionEventInterviewNew);
        }
        }
        return transactionEvent;
    }