Ver Fonte

/student/wfCadreCandidate 干部候选人分页查询入参增加干部部门编号(cadreDeptId)入参

phoenix há 1 ano atrás
pai
commit
f1349ec539

+ 5 - 2
src/main/java/com/xjrsoft/module/student/dto/WfCadreCandidatePageDto.java

@@ -21,6 +21,9 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class WfCadreCandidatePageDto extends PageInput {
-
-
+    /**
+     * 干部部门编号
+     */
+    @ApiModelProperty("干部部门编号")
+    private Long cadreDeptId;
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/student/service/impl/CadreDeptServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJAbstractWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
@@ -41,7 +42,6 @@ public class CadreDeptServiceImpl extends MPJBaseServiceImpl<CadreDeptMapper, Ca
 
     @Override
     public List<CadreDeptTreeVo> getCadreDeptTree(CadreDeptTreeDto dto) {
-
         List<CadreDeptTreeVo> list = cadreDeptMapper.getCadreDeptTree(dto);
 
         List<CadreDeptTreeVo> treeVoList = TreeUtil.build(list);

+ 3 - 0
src/main/resources/mapper/student/WfCadreCandidateMapper.xml

@@ -15,6 +15,9 @@
                  LEFT JOIN cadre_dept t2 ON (t2.id = t.cadre_dept_id)
                  LEFT JOIN xjr_user t3 ON (t3.id = t.instructor_user_id)
         WHERE t.delete_mark = 0
+        <if test="dto.cadreDeptId != null and dto.cadreDeptId > 0">
+            and t.cadre_dept_id = #{dto.cadreDeptId}
+        </if>
         order by t.id
     </select>
 </mapper>