科室权限添加

bsoft-api/src/main/java/com/bsoft/api/controller/DeptController.java

@@ -4,14 +4,11 @@ import com.bsoft.api.common.Result;
 import com.bsoft.api.common.annotations.CurrentUser;
 import com.bsoft.api.common.annotations.Token;
 import com.bsoft.api.model.SerDepartment;
-import com.bsoft.api.model.reqmodel.QuerySummary;
-import com.bsoft.api.service.SerDeptService;
 import com.bsoft.api.service.SysUserOrgRsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 

bsoft-api/src/main/java/com/bsoft/api/controller/SerDiseaseController.java

 package com.bsoft.api.controller;
 
 import com.bsoft.api.common.Result;
+import com.bsoft.api.common.annotations.CurrentUser;
 import com.bsoft.api.common.annotations.Token;
 import com.bsoft.api.model.SerDisease;
 import com.bsoft.api.model.reqmodel.Disease;
@@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -22,24 +24,26 @@ public class SerDiseaseController {
     private final static Object obj = new Object();
     @Autowired
     private SerDiseaseService serDiseaseService;
+
     /**
      * 根据pageId查询板块数值
+     *
      * @return
      * @throws Exception
      */
     @PostMapping("disease/list")
     @Token
     @ApiOperation("根据疾病编码或者疾病等级查询疾病列表")
-    public Object getDiseaseByLevel(@RequestBody Disease.DiseaseIDorLevel disease) throws InterruptedException {
+    public Object getDiseaseByLevel(@ApiIgnore @CurrentUser Long userId,@RequestBody Disease.DiseaseIDorLevel disease) throws InterruptedException {
         List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(),disease.getDisease(),
-                disease.getLevel(),disease.getDoctor(),disease.getDept());
+                disease.getLevel(),disease.getDoctor(),disease.getDept(),userId);
         return Result.success(diseaseLevel);
     }
 
     @PostMapping("disease/name")
     @Token
     @ApiOperation("根据疾病名称查询疾病信息")
-    public  Object getDiseaseByMdcName(@RequestBody Disease.DiseaseName disease) throws InterruptedException {
+    public Object getDiseaseByMdcName(@RequestBody Disease.DiseaseName disease) throws InterruptedException {
         List<SerDisease> list = serDiseaseService.selectByMdcName(disease.getDate(),disease.getMdcName(),disease.getDoctor(),disease.getDept());
         return Result.success(list);
     }

bsoft-api/src/main/java/com/bsoft/api/controller/SerProjValueController.java

 package com.bsoft.api.controller;
 
 import com.bsoft.api.common.Result;
+import com.bsoft.api.common.annotations.CurrentUser;
 import com.bsoft.api.common.annotations.Token;
 import com.bsoft.api.model.reqmodel.AddBudgetValue;
 import com.bsoft.api.model.reqmodel.QueryBudgetValue;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 
@@ -24,8 +26,8 @@ public class SerProjValueController {
     @PostMapping("budget/value")
     @Token
     @ApiOperation("查询预算编制数据")
-    public Object getProjValue(@RequestBody QueryBudgetValue request) throws Throwable {
-        Object result = projValueService.getValue(request.getProjectType(),request.getDate(),request.getDeptCode());
+    public Object getProjValue(@ApiIgnore @CurrentUser Long userId,@RequestBody QueryBudgetValue request) throws Throwable {
+        Object result = projValueService.getValue(request.getProjectType(),request.getDate(),request.getDeptCode(),userId);
         return Result.success(result);
 
     }
@@ -33,8 +35,8 @@ public class SerProjValueController {
     @PostMapping("budget/save")
     @Token
     @ApiOperation("保存数据")
-    public Object save(@RequestBody AddBudgetValue request) throws Throwable {
-        boolean result = projValueService.save(request);
+    public Object save(@ApiIgnore @CurrentUser Long userId,@RequestBody AddBudgetValue request) throws Throwable {
+        boolean result = projValueService.save(userId,request);
         if(result)
             return Result.success(null);
         else
@@ -44,8 +46,8 @@ public class SerProjValueController {
     @PostMapping("budget/summary")
     @Token
     @ApiOperation("查询预算编制汇总数据")
-    public Object getSummary(@RequestBody QuerySummary request) throws Throwable {
-        Object result = projValueService.getSummary(request.getDate(),request.getBudgetType());
+    public Object getSummary(@ApiIgnore @CurrentUser Long userId,@RequestBody QuerySummary request) throws Throwable {
+        Object result = projValueService.getSummary(request.getDate(),request.getBudgetType(),userId);
         return Result.success(result);
     }
 

bsoft-api/src/main/java/com/bsoft/api/mapper/DicOrgMapper.java

@@ -19,5 +19,5 @@ public interface DicOrgMapper {
 
     int updateByPrimaryKey(DicOrg record);
 
-    List<SerDepartment> selectDeptByUser(@Param("userId") Long userId);
+    List<SerDepartment> selectDeptByUser(@Param("userId") Long userId,@Param("orgId") Long orgId);
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDiseaseMapper.java

@@ -14,23 +14,24 @@ public interface SerDiseaseMapper {
 
     SerDisease selectByPrimaryKey(Long id);
 
-    SerDisease selectByCode(@Param("code") String code, @Param("date") String date, @Param("docCode") String docCode,
+    SerDisease selectByCode(@Param("code") String code,@Param("date") String date,@Param("docCode") String docCode,
                             @Param("deptCode") String deptCode);
 
     List<SerDisease> selectAll();
 
     List<SerDisease> selectByMdcName(@Param("date") String date,@Param("mdcName") String mdcName,
-                                     @Param("docCode") String docCode,@Param("deptCode")String deptCode);
+                                     @Param("docCode") String docCode,@Param("deptCode") String deptCode);
 
     List<DiseaseLevel> selectByLevel(@Param("date") String date,@Param("level") Integer level,
-                                     @Param("docCode") String docCode,@Param("deptCode") String deptCode);
+                                     @Param("docCode") String docCode,@Param("deptCode") String deptCode,
+                                     @Param("orgId") Long orgId,@Param("userId") Long userId);
 
     List<DiseaseLevel> selectByParentId(@Param("date") String date,@Param("parentId") Integer parentId,
                                         @Param("docCode") String docCode,@Param("deptCode") String deptCode);
 
-    DiseaseLevel selectParentById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
+    DiseaseLevel selectParentById(@Param("date") String date,@Param("diseaseId") Integer diseaseId);
 
-    List<DiseaseLevel> selectSonById(@Param("date") String date, @Param("diseaseId") Integer diseaseId,
+    List<DiseaseLevel> selectSonById(@Param("date") String date,@Param("diseaseId") Integer diseaseId,
                                      @Param("docCode") String docCode,@Param("deptCode") String deptCode);
 
     int updateByPrimaryKey(SerDisease record);

bsoft-api/src/main/java/com/bsoft/api/mapper/SerProjValueMapper.java

@@ -22,10 +22,10 @@ public interface SerProjValueMapper {
                                        @Param("typeState") Integer typeState,
                                        @Param("exponentId") Integer exponentId,
                                        @Param("dept") String dept,@Param("date") Integer date,
-                                       @Param("budgetType") Integer budgetType);
+                                       @Param("budgetType") Integer budgetType,@Param("hosCode") String hosCode);
 
     int deleteByDeptWithDate(@Param("dept") String dept,@Param("date") BigDecimal date,
                              @Param("projType") Integer projType);
 
-    void updateValue(@Param("date") BigDecimal date);
+    void updateValue(@Param("date") BigDecimal date,@Param("hosCode") String hosCode);
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerProjValue.java

@@ -77,4 +77,6 @@ public class SerProjValue {
 
     private String szUnit;
 
+    private String hosCode;
+
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/DeptReq.java

+package com.bsoft.api.model.reqmodel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class DeptReq {
+    @ApiModelProperty(value = "机构ID", required = true)
+    @NotNull(message = "机构ID参数必穿")
+    private Long orgId;
+}

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDiseaseServiceImpl.java

 package com.bsoft.api.service.Impl;
 
+import com.bsoft.api.mapper.DicOrgMapper;
 import com.bsoft.api.mapper.SerDiseaseMapper;
+import com.bsoft.api.model.DicOrg;
 import com.bsoft.api.model.SerDisease;
 import com.bsoft.api.model.respmodel.DiseaseLevel;
 import com.bsoft.api.service.SerDiseaseService;
 import com.bsoft.common.utils.StringUtil;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
@@ -14,39 +17,42 @@ import java.util.List;
 public class SerDiseaseServiceImpl implements SerDiseaseService {
     @Resource
     private SerDiseaseMapper serDiseaseMapper;
+    @Resource
+    private DicOrgMapper dicOrgMapper;
 
     @Override
-    public List<DiseaseLevel> selectListByIdorLevel(String date, String diseaseCode,Integer level,String docCode,String deptCode){
+    public List<DiseaseLevel> selectListByIdorLevel(String date,String diseaseCode,Integer level,String docCode,String deptCode,Long userId) {
         List<DiseaseLevel> list = new ArrayList<>();
-        docCode= StringUtil.isNullOrEmpty(docCode)?null:docCode;
-        deptCode= StringUtil.isNullOrEmpty(deptCode)?null:deptCode;
-        if(diseaseCode!=null&&diseaseCode!=""){
+        docCode = StringUtil.isNullOrEmpty(docCode) ? null : docCode;
+        deptCode = StringUtil.isNullOrEmpty(deptCode) ? null : deptCode;
+        if(diseaseCode != null && diseaseCode != ""){
             list = selectByCode(date,diseaseCode,docCode,deptCode);
         }else{
-            list = selectByLevel(date,level,docCode,deptCode);
+            list = selectByLevel(date,level,docCode,deptCode,userId);
         }
         return list;
     }
 
     @Override
-    public List<SerDisease> selectByMdcName(String date, String mdcName,String docCode,String deptCode) {
-        mdcName= StringUtil.isNullOrEmpty(mdcName)?null:mdcName;
-        docCode= StringUtil.isNullOrEmpty(docCode)?null:docCode;
-        deptCode= StringUtil.isNullOrEmpty(deptCode)?null:deptCode;
+    public List<SerDisease> selectByMdcName(String date,String mdcName,String docCode,String deptCode) {
+        mdcName = StringUtil.isNullOrEmpty(mdcName) ? null : mdcName;
+        docCode = StringUtil.isNullOrEmpty(docCode) ? null : docCode;
+        deptCode = StringUtil.isNullOrEmpty(deptCode) ? null : deptCode;
         return serDiseaseMapper.selectByMdcName(date,mdcName,docCode,deptCode);
     }
 
     /**
      * 根据Code查询父子级别列表
+     *
      * @param date 时间
      * @param diseaseCode ID
      * @return
      */
-    private List<DiseaseLevel> selectByCode(String date, String diseaseCode,String docCode,String deptCode){
+    private List<DiseaseLevel> selectByCode(String date,String diseaseCode,String docCode,String deptCode) {
 
 
         SerDisease disease = serDiseaseMapper.selectByCode(diseaseCode,date,docCode,deptCode);
-        if(disease==null){
+        if(disease == null){
             return null;
         }
         //查询父级菜单对象
@@ -54,9 +60,9 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
         List<DiseaseLevel> parentList = new ArrayList<>();
 
         //查询同级菜单列表
-        List<DiseaseLevel> serDiseaseList =  serDiseaseMapper.selectByParentId(date,disease.getParentId().intValue(),docCode,deptCode);
+        List<DiseaseLevel> serDiseaseList = serDiseaseMapper.selectByParentId(date,disease.getParentId().intValue(),docCode,deptCode);
         List<DiseaseLevel> diseaseLevelList = new ArrayList<>();
-        for (DiseaseLevel serDiseases: serDiseaseList) {
+        for(DiseaseLevel serDiseases : serDiseaseList){
             DiseaseLevel diseaseLevel1 = new DiseaseLevel();
             //查询子级菜单列表
             if(serDiseases.getMdcCode().equals(diseaseCode)){
@@ -74,25 +80,26 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
             diseaseLevel1.setParentId(serDiseases.getParentId());
             diseaseLevelList.add(diseaseLevel1);
         }
-        if(diseaseLevel!=null){
+        if(diseaseLevel != null){
             diseaseLevel.setDiseaseLevelList(diseaseLevelList);
             parentList.add(diseaseLevel);
             return parentList;
-        }else {
+        }else{
             return diseaseLevelList;
         }
     }
 
     /**
      * 根据等级查询所有该等级数据
+     *
      * @param date
      * @param level
      * @return
      */
-    private List<DiseaseLevel> selectByLevel(String date, Integer level,String docCode,String deptCode) {
-        if(level==null){
-            level=0;
+    private List<DiseaseLevel> selectByLevel(String date,Integer level,String docCode,String deptCode,Long userId) {
+        if(level == null){
+            level = 0;
         }
-        return serDiseaseMapper.selectByLevel(date,level,docCode,deptCode);
+        return serDiseaseMapper.selectByLevel(date,level,docCode,deptCode,null,userId);
     }
 }

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerProjValueServiceImpl.java

@@ -4,10 +4,8 @@ import com.bsoft.api.common.enums.BudgetType;
 import com.bsoft.api.common.enums.ProjectType;
 import com.bsoft.api.common.enums.StateType;
 import com.bsoft.api.common.enums.TypeState;
-import com.bsoft.api.mapper.SerPageProjValueMapper;
-import com.bsoft.api.mapper.SerPageValueConfigMapper;
-import com.bsoft.api.mapper.SerProjMapper;
-import com.bsoft.api.mapper.SerProjValueMapper;
+import com.bsoft.api.mapper.*;
+import com.bsoft.api.model.DicOrg;
 import com.bsoft.api.model.SerPageValueConfig;
 import com.bsoft.api.model.SerProjValue;
 import com.bsoft.api.model.reqmodel.AddBudgetValue;
@@ -32,10 +30,15 @@ public class SerProjValueServiceImpl implements SerProjValueService {
     private SerPageProjValueMapper pageProjValueMapper;
     @Resource
     private SerPageValueConfigMapper pageValueConfigMapper;
+    @Resource
+    private DicOrgMapper dicOrgMapper;
 
     //查询项目数值
     @Override
-    public Object getValue(Integer projectType,Integer date,String deptCode) throws Throwable {
+    public Object getValue(Integer projectType,Integer date,String deptCode,Long userId) throws Throwable {
+        List<DicOrg> orgList = dicOrgMapper.selectByUser(userId);
+        String orgCode = orgList != null && orgList.size() > 0 ? orgList.get(0).getOrgCode() : null;
+
         List<ProjectValue> result = new ArrayList<>();
         List<Map<String,Object>> enumList = TypeState.all();
         if(enumList != null && enumList.size() > 0){
@@ -51,7 +54,7 @@ public class SerProjValueServiceImpl implements SerProjValueService {
                 if(projectInfo != null && projectInfo.size() > 0){
                     for(ProjectInfo projInfo : projectInfo){
                         values = serProjValueMapper.selectValue(projectType,(Integer)enumInfo.get("value"),
-                                projInfo.getExponentId(),deptCode,date,BudgetType.NOT.getValue());
+                                projInfo.getExponentId(),deptCode,date,BudgetType.NOT.getValue(),orgCode);
                         resultValues = getLevelData(values,BigDecimal.valueOf(PROJ_TOP_PARENT_ID));
                         if(resultValues != null && resultValues.size() > 0)
                             projInfo.setProjectValues(resultValues);
@@ -66,8 +69,10 @@ public class SerProjValueServiceImpl implements SerProjValueService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean save(AddBudgetValue request) {
+    public boolean save(Long userId,AddBudgetValue request) {
         int result = 0;
+        List<DicOrg> orgList = dicOrgMapper.selectByUser(userId);
+        String orgCode = orgList.get(0).getOrgCode();
         if(request != null && request.getBudgetValues() != null && request.getBudgetValues().size() > 0){
             //先进行删除操作
             result = serProjValueMapper.deleteByDeptWithDate(request.getDeptCode(),request.getDate(),request.getProjType());
@@ -80,16 +85,20 @@ public class SerProjValueServiceImpl implements SerProjValueService {
                 info.setCreateDate(new Date());
                 info.setState(BigDecimal.valueOf(StateType.ON.getValue()));
                 info.setVersion(String.valueOf(version));
+                info.setHosCode(orgCode);
                 serProjValueMapper.insert(info);
             }
             //调用计算数值存储过程
-            serProjValueMapper.updateValue(request.getDate());
+            serProjValueMapper.updateValue(request.getDate(),orgCode);
         }
         return result > 0;
     }
 
     @Override
-    public Object getSummary(Integer date,Integer budgetType) {
+    public Object getSummary(Integer date,Integer budgetType,Long userId) {
+        List<DicOrg> orgList = dicOrgMapper.selectByUser(userId);
+        String orgCode = orgList.get(0).getOrgCode();
+
         List<Summary> result = serProjMapper.selectDept(date,budgetType);
         if(result != null && result.size() > 0){
             for(Summary summary : result){
@@ -102,7 +111,7 @@ public class SerProjValueServiceImpl implements SerProjValueService {
                         projType = new SummaryProjType();
                         projType.setProjTypeName(String.valueOf(enumInfo.get("description")));
                         List<SerProjValueResp> values = serProjValueMapper.selectValue((Integer)enumInfo.get("value"),null,
-                                null,summary.getDeptCode(),date,budgetType);
+                                null,summary.getDeptCode(),date,budgetType,orgCode);
                         if(values != null)
                             projType.setProject(values);
                         summary.getProjTypeList().add(projType);

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SysUserOrgRsServiceImpl.java

@@ -2,6 +2,7 @@ package com.bsoft.api.service.Impl;
 
 import com.bsoft.api.mapper.DicOrgMapper;
 import com.bsoft.api.mapper.SysUserOrgRsMapper;
+import com.bsoft.api.model.DicOrg;
 import com.bsoft.api.model.SerDepartment;
 import com.bsoft.api.model.SysUserOrgRs;
 import com.bsoft.api.service.SysUserOrgRsService;
@@ -16,6 +17,8 @@ public class SysUserOrgRsServiceImpl implements SysUserOrgRsService {
     private SysUserOrgRsMapper sysUserOrgRsMapper;
     @Resource
     private DicOrgMapper orgMapper;
+    @Resource
+    private DicOrgMapper dicOrgMapper;
 
     @Override
     public int add(SysUserOrgRs sysUserOrgRs) {
@@ -49,7 +52,9 @@ public class SysUserOrgRsServiceImpl implements SysUserOrgRsService {
 
     @Override
     public List<SerDepartment> getUserOrg(Long userId) {
-        List<SerDepartment> list = orgMapper.selectDeptByUser(userId);
+        List<DicOrg> orgList = dicOrgMapper.selectByUser(userId);
+        Long orgId = orgList != null && orgList.size() > 0 ? orgList.get(0).getId() : null;
+        List<SerDepartment> list = orgMapper.selectDeptByUser(userId,orgId);
         return list;
     }
 

bsoft-api/src/main/java/com/bsoft/api/service/SerDiseaseService.java

@@ -8,5 +8,6 @@ import java.util.List;
 public interface SerDiseaseService {
 
     List<SerDisease> selectByMdcName(String date,String mdcName,String docCode,String deptCode);
-    List<DiseaseLevel> selectListByIdorLevel(String date,String diseaseCode,Integer level,String docCode,String deptCode);
+
+    List<DiseaseLevel> selectListByIdorLevel(String date,String diseaseCode,Integer level,String docCode,String deptCode,Long userId);
 }

bsoft-api/src/main/java/com/bsoft/api/service/SerProjValueService.java

@@ -6,13 +6,13 @@ import java.util.Map;
 
 public interface SerProjValueService {
     //顶级项目的父级id
-    final static Integer PROJ_TOP_PARENT_ID  =0;
+    final static Integer PROJ_TOP_PARENT_ID = 0;
 
-    Object getValue(Integer projectType,Integer date,String deptCode) throws Throwable;
+    Object getValue(Integer projectType,Integer date,String deptCode,Long userId) throws Throwable;
 
-    boolean save(AddBudgetValue request);
+    boolean save(Long userId,AddBudgetValue request);
 
-    Object getSummary(Integer date,Integer budgetType);
+    Object getSummary(Integer date,Integer budgetType,Long userId);
 
     Object getData(Integer date,Integer page);
 

bsoft-api/src/main/resources/mapper/DicOrgMapper.xml

@@ -71,12 +71,16 @@
     SELECT o.*
     FROM SYS_USER_ORG_RS uor,DIC_ORG o
     where uor.ORG_ID=o.ID and uor.USER_ID= #{userId,jdbcType=DECIMAL}
-        and uor.STATE = 1 and o.STATE = 1
+        and uor.STATE = 1 and o.STATE = 1 and o.PARENT_ID = 0
   </select>
   <select id="selectDeptByUser" resultMap="SummaryDept">
     select o.ID,o.ORG_CODE as KSBM,o.ORG_NAME as KSMC
     from SYS_USER_ORG_RS rs
     join DIC_ORG o on o.id = rs.ORG_ID and rs.STATE = 1
-    where o.STATE = 1 and  o.PARENT_ID != 0 and rs.USER_ID = #{userId,jdbcType=DECIMAL}
+    where o.STATE = 1
+        <if test="orgId!=null">
+            and  o.PARENT_ID = #{orgId,jdbcType=DECIMAL}
+        </if>
+        and rs.USER_ID = #{userId,jdbcType=DECIMAL}
   </select>
 </mapper>
\ No newline at end of file

bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml

@@ -37,8 +37,8 @@
       MDC_NUM, PARENT_ID, LEVEL,
       ORG_ID, ORG_NAME)
     values (
-      #{mdcCode,jdbcType=VARCHAR}, #{mdcName,jdbcType=VARCHAR}, #{date,jdbcType=DECIMAL}, 
-      #{mdcNum,jdbcType=DECIMAL}, #{parentId,jdbcType=DECIMAL}, #{level,jdbcType=DECIMAL}, 
+      #{mdcCode,jdbcType=VARCHAR}, #{mdcName,jdbcType=VARCHAR}, #{date,jdbcType=DECIMAL},
+      #{mdcNum,jdbcType=DECIMAL}, #{parentId,jdbcType=DECIMAL}, #{level,jdbcType=DECIMAL},
       #{orgId,jdbcType=DECIMAL}, #{orgName,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerDisease">
@@ -109,10 +109,18 @@
             and d."LEVEL" = #{level,jdbcType=DECIMAL}
         </if>
       <if test="docCode!=null">
-          and rs.DOC_CODE=#{docCode,jdbcType=VARCHAR}
+          and rs.DOC_CODE = #{docCode,jdbcType=DECIMAL}
       </if>
       <if test="deptCode!=null">
-          and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
+          and rs.DEPT_CODE = #{deptCode,jdbcType=VARCHAR}
+      </if>
+      <if test="deptCode==null">
+          and rs.DEPT_CODE in(select o2.ORG_CODE as DEPT_CODE
+          from SYS_USER_ORG_RS rs2
+          join DIC_ORG o2 on o2.id = rs2.ORG_ID and rs2.STATE = 1
+          where o2.STATE = 1
+          and rs2.USER_ID = #{userId,jdbcType=DECIMAL}
+          )
       </if>
       order by d.MDC_NUM
   </select>

bsoft-api/src/main/resources/mapper/SerProjValueMapper.xml

@@ -25,6 +25,7 @@
     <result column="CSYSZ_UNIT" jdbcType="VARCHAR" property="csyszUnit" />
     <result column="YSZ_UNIT" jdbcType="VARCHAR" property="yszUnit" />
     <result column="SZ_UNIT" jdbcType="VARCHAR" property="szUnit" />
+    <result column="HOSCODE" jdbcType="VARCHAR" property="hosCode" />
   </resultMap>
   <resultMap id="SerProjValueResp" extends="BaseResultMap" type="com.bsoft.api.model.respmodel.SerProjValueResp">
       <result column="PROJ_NAME" jdbcType="VARCHAR" property="projName"/>
@@ -45,14 +46,14 @@
       YSZ, YSZ_TB, SZ, ZXPL,
       "DATE", DEPT_CODE, SORT,
       VERSION, QNZ_UNIT, CSYSZ_UNIT,
-      YSZ_UNIT, SZ_UNIT)
+      YSZ_UNIT, SZ_UNIT,HOSCODE)
     values (#{id,jdbcType=DECIMAL},#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
       #{projId,jdbcType=DECIMAL}, #{qnz,jdbcType=DECIMAL}, #{wqqs,jdbcType=DECIMAL},
       #{ls,jdbcType=DECIMAL}, #{mb,jdbcType=DECIMAL}, #{csysz,jdbcType=DECIMAL}, #{csyszTb,jdbcType=DECIMAL},
       #{ysz,jdbcType=DECIMAL}, #{yszTb,jdbcType=DECIMAL}, #{sz,jdbcType=DECIMAL}, #{zxpl,jdbcType=DECIMAL},
       #{date,jdbcType=DECIMAL}, #{deptCode,jdbcType=VARCHAR}, #{sort,jdbcType=DECIMAL},
       #{version,jdbcType=VARCHAR}, #{qnzUnit,jdbcType=VARCHAR}, #{csyszUnit,jdbcType=VARCHAR},
-      #{yszUnit,jdbcType=VARCHAR}, #{szUnit,jdbcType=VARCHAR})
+      #{yszUnit,jdbcType=VARCHAR}, #{szUnit,jdbcType=VARCHAR}, #{hosCode,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerProjValue">
     update SER_PROJ_VALUE
@@ -77,20 +78,21 @@
       QNZ_UNIT = #{qnzUnit,jdbcType=VARCHAR},
       CSYSZ_UNIT = #{csyszUnit,jdbcType=VARCHAR},
       YSZ_UNIT = #{yszUnit,jdbcType=VARCHAR},
-      SZ_UNIT = #{szUnit,jdbcType=VARCHAR}
+      SZ_UNIT = #{szUnit,jdbcType=VARCHAR},
+      HOSCODE = #{hosCode,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=DECIMAL}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     select ID, CREATE_DATE, CREATE_USERID, "STATE", PROJ_ID, QNZ, WQQS, LS, MB, CSYSZ, 
     CSYSZ_TB, YSZ, YSZ_TB, SZ, ZXPL, "DATE", DEPT_CODE, SORT, VERSION, QNZ_UNIT, CSYSZ_UNIT,
-    YSZ_UNIT, SZ_UNIT
+    YSZ_UNIT, SZ_UNIT, HOSCODE
     from SER_PROJ_VALUE
     where ID = #{id,jdbcType=DECIMAL}
   </select>
   <select id="selectAll" resultMap="BaseResultMap">
     select ID, CREATE_DATE, CREATE_USERID, "STATE", PROJ_ID, QNZ, WQQS, LS, MB, CSYSZ, 
     CSYSZ_TB, YSZ, YSZ_TB, SZ, ZXPL, "DATE", DEPT_CODE, SORT, VERSION, QNZ_UNIT, CSYSZ_UNIT,
-    YSZ_UNIT, SZ_UNIT
+    YSZ_UNIT, SZ_UNIT, HOSCODE
     from SER_PROJ_VALUE
   </select>
   <select id="selectValue" resultMap="SerProjValueResp">
@@ -107,6 +109,9 @@
             <if test="date!=null">
                 AND v."DATE" = #{date,jdbcType=DECIMAL}
             </if>
+            <if test="hosCode!=null">
+                AND v.HOSCODE = #{hosCode,jdbcType=VARCHAR}
+            </if>
         GROUP BY v.PROJ_ID
         )m on m.PROJ_ID = p.ID
         left JOIN SER_PROJ_VALUE v ON v.PROJ_ID = m.PROJ_ID AND v.VERSION = m.VERSION
@@ -116,6 +121,9 @@
             <if test="date!=null">
                 AND v."DATE" = #{date,jdbcType=DECIMAL}
             </if>
+            <if test="hosCode!=null">
+                AND v.HOSCODE = #{hosCode,jdbcType=VARCHAR}
+            </if>
         WHERE 1 = 1 and p."STATE" = 1
             <if test="projType!=null">
                 AND p.PROJ_TYPE = #{projType,jdbcType=DECIMAL}
@@ -142,7 +150,8 @@
   </update>
   <update id="updateValue" statementType="CALLABLE">
    	{call ESTIMATE_UPDATE_GZD_BL(
-  		#{date,jdbcType=DECIMAL}
+  		#{date,jdbcType=DECIMAL},
+  		#{hosCode,jdbcType=VARCHAR}
   	)}
   </update>
 </mapper>
\ No newline at end of file