公司/分部 列表接口

src/com/engine/organization/entity/comp/bo/CompBO.java

@@ -1,13 +1,11 @@
 package com.engine.organization.entity.comp.bo;
 
 import com.engine.organization.entity.comp.dto.CompListDTO;
+import com.engine.organization.entity.comp.param.CompSearchParam;
 import com.engine.organization.entity.comp.po.CompPO;
 import org.apache.commons.collections.CollectionUtils;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -30,7 +28,6 @@ public class CompBO {
                 .orgCode(e.getOrgCode())
                 .industry(e.getIndustry())
                 .compPrincipal(e.getCompPrincipal())
-                .description(e.getDescription())
                 .forbiddenTag(e.getForbiddenTag())
                 .build()
         ).collect(Collectors.toList());
@@ -41,4 +38,28 @@ public class CompBO {
         }).collect(Collectors.toList());
     }
 
+    public static CompPO convertParamToPO(CompSearchParam param, Long employeeId) {
+        if (null == param) {
+            return null;
+        }
+        return CompPO.builder()
+                .id(param.getId() == null ? 0 : param.getId())
+                .compNo(param.getCompNo())
+                .compName(param.getCompName())
+                .compNameShort(param.getCompNameShort())
+                .parentCompany(param.getParentCompany())
+                .orgCode(param.getOrgCode())
+                .industry(param.getIndustry())
+                .compPrincipal(param.getCompPrincipal())
+                .description(param.getDescription())
+                .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1)
+                .deleteType(0)
+                .createTime(new Date())
+                .updateTime(new Date())
+                .creator(employeeId)
+                .build();
+
+    }
+
+
 }

src/com/engine/organization/entity/comp/dto/CompListDTO.java

@@ -78,17 +78,11 @@ public class CompListDTO {
     @TableTitle(title = "负责人", dataIndex = "compPrincipal", key = "compPrincipal")
     private Integer compPrincipal;
 
-    /**
-     * 说明
-     */
-    @TableTitle(title = "说明", dataIndex = "description", key = "description")
-    private String description;
-
     /**
      * 禁用标记
      */
     @TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag")
-    private String forbiddenTag;
+    private int forbiddenTag;
 
     /**
      * 子节点

src/com/engine/organization/entity/comp/param/CompSearchParam.java

@@ -0,0 +1,70 @@
+package com.engine.organization.entity.comp.param;
+
+import com.engine.organization.common.BaseQueryParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @description: TODO
+ * @author:dxfeng
+ * @createTime: 2022/05/16
+ * @version: 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class CompSearchParam  extends BaseQueryParam {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 编号
+     */
+    private String compNo;
+
+    /**
+     * 名称
+     */
+    private String compName;
+
+    /**
+     * 简称
+     */
+    private String compNameShort;
+
+    /**
+     * 上级公司
+     */
+    private Long parentCompany;
+
+    /**
+     * 组织机构代码
+     */
+    private String orgCode;
+
+    /**
+     * 行业
+     */
+    private Integer industry;
+
+    /**
+     * 负责人
+     */
+    private Integer compPrincipal;
+
+    /**
+     * 说明
+     */
+    private String description;
+
+    /**
+     * 禁用标记
+     */
+    private Boolean forbiddenTag;
+}

src/com/engine/organization/entity/comp/po/CompPO.java

@@ -18,16 +18,57 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class CompPO {
+
+    /**
+     * 主键
+     */
     private Long id;
+
+    /**
+     * 编号
+     */
     private String compNo;
+
+    /**
+     * 名称
+     */
     private String compName;
+
+    /**
+     * 简称
+     */
     private String compNameShort;
+
+    /**
+     * 上级公司
+     */
     private Long parentCompany;
+
+    /**
+     * 组织机构代码
+     */
     private String orgCode;
+
+    /**
+     * 行业
+     */
     private Integer industry;
+
+    /**
+     * 负责人
+     */
     private Integer compPrincipal;
+
+    /**
+     * 说明
+     */
     private String description;
-    private String forbiddenTag;
+
+    /**
+     * 禁用标记
+     */
+    private Integer forbiddenTag;
+
     private Long creator;
     private int deleteType;
     private Date createTime;

src/com/engine/organization/mapper/comp/CompMapper.java

@@ -1,9 +1,9 @@
 package com.engine.organization.mapper.comp;
 
-import com.engine.organization.common.BaseQueryParam;
 import com.engine.organization.entity.comp.po.CompPO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -15,8 +15,30 @@ import java.util.List;
 public interface CompMapper {
     /**
      * 列表查询
-     * @param queryParam
+     * @param compPO
      * @return
      */
-    List<CompPO> list(@Param("param") BaseQueryParam queryParam);
+    List<CompPO> list(CompPO compPO);
+
+    /**
+     * 根据No查询数据
+     *
+     * @param compNo
+     * @return
+     */
+    List<CompPO> listByNo(@Param("compNo") String compNo);
+
+    /**
+     * 更新禁用标记
+     *
+     * @param compPO
+     * @return
+     */
+    int updateForbiddenTagById(CompPO compPO);
+    /**
+     * 批量删除职务信息方案
+     *
+     * @param ids
+     */
+    int deleteByIds(@Param("ids") Collection<Long> ids);
 }

src/com/engine/organization/mapper/comp/CompMapper.xml

@@ -38,13 +38,92 @@
         , t.update_time
     </sql>
 
-    <select id="list" resultMap="BaseResultMap">
+    <sql id="paramSql">
+        <if test="compNo != null and compNo !='' ">
+            and comp_no like CONCAT('%',#{compNo},'%')
+        </if>
+        <if test="compName != null and compName !='' ">
+            and comp_name like CONCAT('%',#{compName},'%')
+        </if>
+        <if test="compNameShort != null and compNameShort !='' ">
+            and comp_name_short like CONCAT('%',#{compNameShort},'%')
+        </if>
+        <if test="orgCode != null and orgCode !='' ">
+            and org_code like CONCAT('%',#{orgCode},'%')
+        </if>
+    </sql>
+<!--    <sql id="paramSql" databaseId="oracle">-->
+<!--        <if test="compNo != null and compNo !='' ">-->
+<!--            and comp_no like '%'||#{compNo}||'%'-->
+<!--        </if>-->
+<!--        <if test="compName != null and compName !='' ">-->
+<!--            and comp_name like '%'||#{compName}||'%'-->
+<!--        </if>-->
+<!--        <if test="compNameShort != null and compNameShort !='' ">-->
+<!--            and comp_name_short like '%'||#{compNameShort}||'%'-->
+<!--        </if>-->
+<!--        <if test="orgCode != null and orgCode !='' ">-->
+<!--            and org_code like '%'||#{orgCode}||'%'-->
+<!--        </if>-->
+<!--    </sql>-->
+<!--    <sql id="paramSql" databaseId="sqlserver">-->
+<!--        <if test="compNo != null and compNo !='' ">-->
+<!--            and comp_no like '%'+#{compNo}+'%'-->
+<!--        </if>-->
+<!--        <if test="compName != null and compName !='' ">-->
+<!--            and comp_name like '%'+#{compName}+'%'-->
+<!--        </if>-->
+<!--        <if test="compNameShort != null and compNameShort !='' ">-->
+<!--            and comp_name_short like '%'+#{compNameShort}+'%'-->
+<!--        </if>-->
+<!--        <if test="orgCode != null and orgCode !='' ">-->
+<!--            and org_code like '%'+#{orgCode}+'%'-->
+<!--        </if>-->
+<!--    </sql>-->
+
+    <select id="list" resultMap="BaseResultMap" parameterType="com.engine.organization.entity.comp.po.CompPO">
         SELECT
         <include refid="baseColumns"/>
         FROM
         jcl_org_comp t
         WHERE t.delete_type = 0
+        <if test="parentCompany != null and parentCompany !='' ">
+            and parent_company = #{parentCompany}
+        </if>
+        <if test="compPrincipal != null and compPrincipal !='' ">
+            and comp_principal = #{compPrincipal}
+        </if>
+        <if test="industry != null and industry !='' ">
+            and industry = #{industry}
+        </if>
+        <if test="forbiddenTag != null and forbiddenTag !='' ">
+            and forbidden_tag = #{forbiddenTag}
+        </if>
+        <include refid="paramSql"/>
+    </select>
+
+    <select id="listByNo" parameterType="com.engine.organization.entity.comp.po.CompPO" resultMap="BaseResultMap">
+        select
+        <include refid="baseColumns"/>
+        from jcl_org_comp t where comp_no = #{compNo} AND delete_type = 0
     </select>
 
+    <update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.sequence.po.SequencePO">
+        update jcl_org_comp
+        <set>
+            forbidden_tag=#{forbiddenTag},
+        </set>
+        WHERE id = #{id} AND delete_type = 0
+    </update>
+
+    <update id="deleteByIds">
+        UPDATE jcl_org_comp
+        SET delete_type = 1
+        WHERE delete_type = 0
+        AND id IN
+        <foreach collection="ids" open="(" item="id" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 
 </mapper>

src/com/engine/organization/service/CompService.java

@@ -1,7 +1,8 @@
 package com.engine.organization.service;
 
-import com.engine.organization.common.BaseQueryParam;
+import com.engine.organization.entity.comp.param.CompSearchParam;
 
+import java.util.Collection;
 import java.util.Map;
 
 /**
@@ -14,8 +15,37 @@ public interface CompService {
 
     /**
      * 列表
-     * @param baseQueryParam
+     * @param params
      * @return
      */
-    Map<String,Object> listPage(BaseQueryParam baseQueryParam);
+    Map<String,Object> listPage(CompSearchParam params);
+
+    /**
+     * 更新禁用标记
+     *
+     * @param params
+     */
+    int updateForbiddenTagById(CompSearchParam params);
+
+
+    /**
+     * 根据ID批量删除
+     *
+     * @param ids
+     */
+    int deleteByIds(Collection<Long> ids);
+
+    /**
+     * 获取搜索条件
+     *
+     * @param params
+     * @return
+     */
+    Map<String, Object> getSearchCondition(Map<String, Object> params);
+
+    /**
+     * 获取列表页面按钮信息
+     * @return
+     */
+    Map<String, Object> getHasRight();
 }

src/com/engine/organization/service/impl/CompServiceImpl.java

@@ -1,25 +1,28 @@
 package com.engine.organization.service.impl;
 
 
+import com.api.browser.bean.SearchConditionGroup;
+import com.api.browser.bean.SearchConditionItem;
+import com.api.browser.bean.SearchConditionOption;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
 import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.core.impl.Service;
-import com.engine.organization.common.BaseQueryParam;
 import com.engine.organization.component.OrganizationWeaTable;
 import com.engine.organization.entity.comp.bo.CompBO;
 import com.engine.organization.entity.comp.dto.CompListDTO;
+import com.engine.organization.entity.comp.param.CompSearchParam;
 import com.engine.organization.entity.comp.po.CompPO;
 import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.service.CompService;
+import com.engine.organization.util.MenuBtn;
+import com.engine.organization.util.OrganizationAssert;
+import com.engine.organization.util.OrganizationFormItemUtil;
 import com.engine.organization.util.db.MapperProxyFactory;
 import com.engine.organization.util.page.Column;
 import com.engine.organization.util.page.PageInfo;
 import com.engine.organization.util.page.PageUtil;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -34,18 +37,19 @@ public class CompServiceImpl extends Service implements CompService {
     }
 
     @Override
-    public Map<String, Object> listPage(BaseQueryParam queryParam) {
+    public Map<String, Object> listPage(CompSearchParam params) {
         Map<String,Object> datas = new HashMap<>();
-        PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
-        List<CompPO> list = getCompMapper().list(queryParam);
+        PageUtil.start(params.getCurrent(), params.getPageSize());
+        List<CompPO> list = getCompMapper().list(CompBO.convertParamToPO(params,(long) user.getUID()));
         PageInfo<CompPO> pageInfo = new PageInfo<>(list, CompPO.class);
         Collection<CompPO> compPOS = pageInfo.getList();
+        //
 
         List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(compPOS);
         PageInfo<CompListDTO> pageInfos = new PageInfo<>(compListDTOS, CompListDTO.class);
         pageInfos.setTotal(pageInfo.getTotal());
-        pageInfos.setPageNum(queryParam.getCurrent());
-        pageInfos.setPageSize(queryParam.getPageSize());
+        pageInfos.setPageNum(params.getCurrent());
+        pageInfos.setPageSize(params.getPageSize());
 
         OrganizationWeaTable<CompListDTO> table = new OrganizationWeaTable<>(user, CompListDTO.class);
         List<Column> columns = pageInfos.getColumns();
@@ -62,4 +66,63 @@ public class CompServiceImpl extends Service implements CompService {
         datas.put("dataKey",result.getResultMap());
         return datas;
     }
+
+    @Override
+    public int updateForbiddenTagById(CompSearchParam params) {
+        CompPO compPO = CompPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build();
+        return getCompMapper().updateForbiddenTagById(compPO);
+    }
+
+    @Override
+    public int deleteByIds(Collection<Long> ids) {
+        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        return getCompMapper().deleteByIds(ids);
+    }
+
+    @Override
+    public Map<String, Object> getSearchCondition(Map<String, Object> params) {
+        Map<String, Object> apiDatas = new HashMap<>();
+        List<SearchConditionGroup> addGroups = new ArrayList<>();
+        List<SearchConditionItem> conditionItems = new ArrayList<>();
+        // 编号
+        SearchConditionItem compNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "compNo");
+        // 名称
+        SearchConditionItem compNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "compName");
+        // 简称
+        SearchConditionItem compNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "简称", "compNameShort");
+        // TODO
+        // 上级公司
+        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "161", "parentCompany", "compBrowser");
+        // 组织机构代码
+        SearchConditionItem orgCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "组织机构代码", "orgCode");
+        // 行业
+        SearchConditionItem industryItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "行业", "industry");
+        // 负责人
+        SearchConditionItem compPrincipalItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "负责人", "compPrincipal");
+        // 禁用标记
+        List<SearchConditionOption> selectOptions = new ArrayList<>();
+        SearchConditionOption enableOption = new SearchConditionOption("0","启用");
+        SearchConditionOption disableOption = new SearchConditionOption("1","禁用");
+        selectOptions.add(enableOption);
+        selectOptions.add(disableOption);
+        SearchConditionItem forbiddenTagItem=  OrganizationFormItemUtil.selectItem(user,selectOptions,2,16,6,false,"禁用标记","forbiddenTag");
+
+        conditionItems.add(compNoItem);
+        conditionItems.add(compNameItem);
+        conditionItems.add(compNameShortItem);
+        conditionItems.add(compBrowserItem);
+        conditionItems.add(orgCodeItem);
+        conditionItems.add(industryItem);
+        conditionItems.add(compPrincipalItem);
+        conditionItems.add(forbiddenTagItem);
+
+        addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
+        apiDatas.put("conditions", addGroups);
+        return apiDatas;
+    }
+
+    @Override
+    public Map<String, Object> getHasRight() {
+        return MenuBtn.getCommonBtnDatas();
+    }
 }

src/com/engine/organization/web/CompController.java

@@ -1,7 +1,7 @@
 package com.engine.organization.web;
 
 import com.engine.common.util.ServiceUtil;
-import com.engine.organization.common.BaseQueryParam;
+import com.engine.organization.entity.comp.param.CompSearchParam;
 import com.engine.organization.util.response.ReturnResult;
 import com.engine.organization.wrapper.CompWrapper;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
@@ -32,15 +32,16 @@ public class CompController {
      *
      * @param request
      * @param response
+     * @param params
      * @return
      */
     @POST
     @Path("/listComp")
     @Produces(MediaType.APPLICATION_JSON)
-    public ReturnResult listComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody BaseQueryParam queryParam) {
+    public ReturnResult listComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody CompSearchParam params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).listPage(queryParam));
+            return ReturnResult.successed(getCompWrapper(user).listPage(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e.getMessage());
         }

src/com/engine/organization/wrapper/CompWrapper.java

@@ -2,7 +2,7 @@ package com.engine.organization.wrapper;
 
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
-import com.engine.organization.common.BaseQueryParam;
+import com.engine.organization.entity.comp.param.CompSearchParam;
 import com.engine.organization.service.CompService;
 import com.engine.organization.service.impl.CompServiceImpl;
 import weaver.hrm.User;
@@ -26,7 +26,7 @@ public class CompWrapper extends Service {
      * @param params
      * @return
      */
-    public Map<String, Object> listPage(BaseQueryParam params) {
+    public Map<String, Object> listPage(CompSearchParam params) {
         return getCompService(user).listPage(params);
     }
 }