cjl
2024-06-17 34d9307df9870510f9204659ddf9f5389012cd4d
fix:sql查询时间调整
1 files added
3 files modified
42 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java 3 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/ext/responsibility/ResponsibilityUnitExt.java 26 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java 10 ●●●● patch | view | raw | blame | history
screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml 3 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.entity.ResponsibilityUnit;
import com.moral.api.pojo.ext.responsibility.ResponsibilityUnitExt;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -18,6 +19,8 @@
    String selectAreaCode(@Param("id") Integer id);
    List<ResponsibilityUnitExt> selectResponsibilityUnitList(@Param("id") Integer id);
    /**
     * 查询字典id
     */
screen-api/src/main/java/com/moral/api/pojo/ext/responsibility/ResponsibilityUnitExt.java
New file
@@ -0,0 +1,26 @@
package com.moral.api.pojo.ext.responsibility;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
 * @ClassName ResponsibilityUnit
 * @Description TODO
 * @Author @cjl
 * @Date 2024-06-17 15:44
 * @Version 1.0
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ResponsibilityUnitExt {
    @ApiModelProperty(value = "区域编码")
    private String areaCode;
    @ApiModelProperty(value = "上级编码")
    private String parentCode;
}
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -23,6 +23,7 @@
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.ext.allocation.AllocationListExt;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.ext.responsibility.ResponsibilityUnitExt;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
import com.moral.api.pojo.query.app.AppAllocationFileCond;
@@ -1013,16 +1014,19 @@
    @Override
    public Integer unitAreaCode() {
        // 1 总管理 0普通 2 区域管理
        QxUser user = UserHelper.getCurrentUser();
        List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
        if(CollectionUtils.isNotEmpty(userList)){
            return 1;
        }
        if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0) {
            String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
            if (code.length() > 6) {
            List<ResponsibilityUnitExt> codeList = responsibilityUnitMapper.selectResponsibilityUnitList(user.getUnitId());
            if ( codeList.get(0).getAreaCode().length() > 6) {
                return 0;
            } else {
            } else if(codeList.get(0).getAreaCode().length() == 6 && codeList.get(0).getParentCode().equals("320900")) {
                return 0;
            }else {
                return 2;
            }
        }
screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml
@@ -42,6 +42,9 @@
        select area_code from responsibility_unit t where unit_id = #{id}
    </select>
    <select id="selectResponsibilityUnitList" resultType="com.moral.api.pojo.ext.responsibility.ResponsibilityUnitExt">
        select area_code,parent_code from responsibility_unit t where unit_id = #{id}
    </select>
    <select id="selectName" resultType="java.lang.String">
        select t1.dataValue from sys_dict_type t