1.小程序导半工单管理 2.修改bug

fengjin

2022-10-20 c9f2dfc4b53171d7c7e477c48374488c9d4d1c0a

1.小程序导半工单管理 2.修改bug

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

@@ -1,6 +1,7 @@
package com.dg.core.api;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
@@ -10,17 +11,21 @@
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.util.PermissionUtil;
import com.dg.core.util.SmsUtil;
import com.dg.core.util.TableDataInfo;
import com.dg.core.util.WxUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.LocalDateTime;

import java.util.List;


/**
@@ -36,6 +41,9 @@

    @Autowired
    private IGuideEvolveService iGuideEvolveService;

    @Resource
    IOrganizationChartService iOrganizationChartService;

    private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";

@@ -299,4 +307,33 @@
        return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
    }


    /**
     * 小程序获取导办工单管理列表
     * @return
     */
    @ApiOperation(value = "小程序获取导办工单管理列表",response = GuideRepairOrder.class)
    @GetMapping("/getList")
    @Authorization
    public TableDataInfo selectConfigList(
                                          @RequestParam(value = "status",required = false) String status,
                                          @CurrentUser SysUser sysUser)
    {
        List<String> ids=null;
        String userId=null;
        if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
        {
            userId=null;
            ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        }
        else
        {
            userId=sysUser.getUserId()+"";
        }
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId);
        int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
        return getDataTable(list,num);
    }


}

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

@@ -56,6 +56,17 @@
                                            @Param("status") String status,
                                            @Param("guideUserId") String guideUserId);


    /**
     * 获取工单列表(不分页用于小程序)
     * @param matterName
     * @return
     */
    List<GuideRepairOrder> selectConfigList(@Param("matterName") String matterName,
                                            @Param("ids") List<String> ids,
                                            @Param("status") String status,
                                            @Param("guideUserId") String guideUserId);

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

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

@@ -43,6 +43,14 @@
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                            String matterName,List<String> ids,String status,String guideUserId);

    /**
     * 获取工单列表(不分页用于小程序)
     * @param matterName
     * @return
     */
    List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
                                            String guideUserId);


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

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

@@ -208,6 +208,12 @@
    }

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

    @Override
    public int countConfigList(String matterName, List<String> ids,String status,String guideUserId) {
        return baseMapper.countConfigList(matterName, ids,status,guideUserId);
    }

 flower_city/src/main/resources/application-sms.properties

@@ -3,10 +3,22 @@
aliyun.screct=wkyvU72m6JmCFepCzGVuSpsJOsbRV0
aliyun.SignName=????
aliyun.TemplateCode=SMS_254326275

#??????????,???????????????????????????????????

#??????
#aliyun.TemplateCodeOvertime=SMS_254460011
#??????
aliyun.TemplateCodeOvertime=SMS_254460012
aliyun.TemplateCodeComplete=SMS_254875101

#??????
#aliyun.TemplateCodeComplete=SMS_254875101
#??????
aliyun.TemplateCodeComplete=SMS_254875102

#??????
#aliyun.TemplateCodeSubmit=SMS_254880764
#??????
aliyun.TemplateCodeSubmit=SMS_254880763