1、修改注册企业

src/main/java/com/dk/mdm/controller/mst/OrgController.java

@@ -111,5 +111,25 @@ public class OrgController{
         return orgService.selectChooseOrg(orgQuery);
     }
 
+    /**
+     * @desc : 停用
+     * @author : 周兴
+     * @date :  2024/5/7 9:39
+     */
+    @PostMapping("disable/{id}")
+    public ResponseResultVO<Boolean> disable(@PathVariable String id) {
+        return orgService.disable(id);
+    }
+
+    /**
+     * @desc : 启用
+     * @author : 周兴
+     * @date :  2024/5/7 9:39
+     */
+    @PostMapping("enable/{id}")
+    public ResponseResultVO<Boolean> enable(@PathVariable String id) {
+        return orgService.enable(id);
+    }
+
 
 }

src/main/java/com/dk/mdm/mapper/mst/ComMenuMapper.java

@@ -5,6 +5,7 @@ import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.mst.MenuFrequency;
 import com.dk.mdm.model.query.mst.ComMenuQuery;
 import com.dk.mdm.model.response.mst.ComMenuResponse;
+import com.dk.mdm.model.vo.mst.ComMenuVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -30,10 +31,19 @@ public interface ComMenuMapper extends BaseMapper<ComMenu>{
     int save(List<ComMenu> comMenuList);
 
     /**
+     * @desc   : 保存常用功能（建户使用）
+     * @author : 周兴
+     * @date   : 2024-05-08 10:30
+     */
+    int saveByCompany(ComMenuVO comMenuVO);
+
+    /**
      * @desc   : 删除该员工的功能
      * @author : 周兴
      * @date   : 2024-03-29 10:30
      */
     int deleteMenuByStaff(@Param("staffId") String staffId);
+
+
 }
 

src/main/java/com/dk/mdm/mapper/mst/ComMenuMapper.xml

@@ -137,6 +137,28 @@
         display_no = excluded."display_no";
     </insert>
 
+    <!--新建编辑常用功能(建企业时使用）-->
+    <insert id="saveByCompany">
+        insert into dkic_b.t_mst_com_menu
+        (
+        <trim suffixOverrides=",">
+            menu_uuid,
+            cp_id,
+            staff_id,
+            app_code,
+            display_no,
+        </trim>
+        )
+        select tam.menu_uuid,
+               #{cpId},
+               #{staffId} ::uuid,
+               #{appCode},
+               ROW_NUMBER() OVER () AS row_num
+        from sys.t_app_menu tam
+        where tam.app_code = #{appCode}
+        and tam.object_code = any(#{objectCodeList,typeHandler=StringListTypeHandler})
+    </insert>
+
     <insert id="insertBatch">
         insert into dkic_b.t_mst_com_menu
         (

src/main/java/com/dk/mdm/mapper/mst/OrgMapper.xml

@@ -214,7 +214,7 @@
                 AND parent.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
             </if>
             <if test="flgValid != null">
-                AND flg_valid = #{flgValid}
+                AND parent.flg_valid = #{flgValid}
             </if>
             <if test="cpId != null">
                 AND parent.cp_id = #{cpId}

src/main/java/com/dk/mdm/model/query/mst/OrgQuery.java

@@ -84,6 +84,13 @@ public class OrgQuery extends PageInfo<com.dk.mdm.model.query.mst.OrgQuery> impl
     @ApiModelProperty(value = "业务部门标识")
     private Boolean flgBusiness;
 
+    /**
+     * 有效标识
+     */
+    @Excel(name = "有效标识")
+    @ApiModelProperty(value = "有效标识")
+    private Boolean flgValid;
+
 
     /**
      * 显示顺序

src/main/java/com/dk/mdm/model/vo/mst/ComMenuVO.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.StringListTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
@@ -19,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  常用功能
@@ -44,6 +46,10 @@ public class ComMenuVO extends PageInfo<ComMenuVO> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String menuUuid;
 
+    @ApiModelProperty(value = "功能菜单编码")
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> objectCodeList;
+
 
     /**
      * 企业Id

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -24,6 +24,7 @@ import com.dk.mdm.model.query.mst.ComMenuQuery;
 import com.dk.mdm.model.query.mst.StaffQuery;
 import com.dk.common.model.response.mst.StaffResponse;
 import com.dk.common.model.vo.mst.StaffVO;
+import com.dk.mdm.model.vo.mst.ComMenuVO;
 import com.dk.mdm.service.common.CommonService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -84,6 +85,12 @@ public class StaffService extends BaseService<Staff> {
     private ComMenuService comMenuService;
 
     @Autowired
+    private ComMenuMapper comMenuMapper;
+
+    @Autowired
+    private SettingValueMapper settingValueMapper;
+
+    @Autowired
     private AuthUtils authUtils;
     @Autowired
     DictionaryDataMapper dictionaryDataMapper;
@@ -217,23 +224,46 @@ public class StaffService extends BaseService<Staff> {
         List<Map<String, Object>> listRoles = map.get("roles");
         List<Role> listR = new ArrayList<>();
         String roleid = "";
-        Integer cpid = 0;
-        String staffid = "";
+        Integer cpId = Integer.parseInt(listCom.get(0).get("cpId").toString()) ;
+        String staffId = listCom.get(0).get("staffId").toString();
+
+        // 插入常用功能 标准版 插入 销售出库 库存查询 商品档案
+        if(Constant.STD.equals(gradeCode)){
+            List<String> objectCodeList = new ArrayList<>();
+            // 销售出库
+            objectCodeList.add("order-out");
+            // 库存查询
+            objectCodeList.add("ivt-detail-report");
+            // 商品档案
+            objectCodeList.add("goods");
+            ComMenuVO comMenuVO = new ComMenuVO();
+            comMenuVO.setCpId(cpId).setStaffId(staffId).setAppCode(Constant.AppCode.WEIXIN.getCode())
+                    .setObjectCodeList(objectCodeList);
+            comMenuMapper.saveByCompany(comMenuVO);
+
+            // 系统参数
+            List<SettingValue> settingValueList = new ArrayList<>();
+            // 自动办理
+            settingValueList.add(new SettingValue().setCpId(cpId).setSettingCode(Constant.SystemConstant.IVT_001.getValue())
+                                .setSettingValue("true"));
+            // 欠货销售
+            settingValueList.add(new SettingValue().setCpId(cpId).setSettingCode(Constant.SystemConstant.IVT_002.getValue())
+                    .setSettingValue("true"));
+            settingValueMapper.insertBatch(settingValueList);
+        }
         for (int i = 0; i < listRoles.size(); i++) {
             Map<String, Object> m = listRoles.get(i);
             Role role = new Role();
             //设置编码
-            Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.ROLE.getName(),(Integer) m.get("cpId"), false);
+            Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.ROLE.getName(),cpId, false);
             if (Constant.ROLE_DATA.equals(m.get("roleCode").toString())) {
                 roleid = uniqueNoteCode.get("outId").toString();
-                cpid = (Integer) m.get("cpId");
-                staffid = m.get("opCreateUserId").toString();
             }
             role.setRoleId(uniqueNoteCode.get("outId").toString());
             role.setRoleCode(m.get("roleCode").toString());
             role.setRoleName(m.get("roleName").toString());
             role.setDisplayNo((Integer) m.get("displayNo"));
-            role.setCpId((Integer) m.get("cpId"));
+            role.setCpId(cpId);
             role.setOpCreateUserId(m.get("opCreateUserId").toString());
             listR.add(role);
         }
@@ -242,12 +272,12 @@ public class StaffService extends BaseService<Staff> {
         // 更新用户的角色ids-
         List<String> roleids = new ArrayList<>();
         roleids.add(roleid);
-        this.updateByUuid(new Staff().setStaffId(staffid).setRoleIds(roleids));
+        this.updateByUuid(new Staff().setStaffId(staffId).setRoleIds(roleids));
         // 角色权限
         RoleFun roleFun = new RoleFun();
         roleFun.setRoleId(roleid);
-        roleFun.setCpId(cpid);
-        roleFun.setOpCreateUserId(staffid);
+        roleFun.setCpId(cpId);
+        roleFun.setOpCreateUserId(staffId);
         roleFunMapper.insertRoleFunFeign(roleFun);
         // 仓库
         List<Map<String, Object>> listWarehouses = map.get("warehouses");
@@ -259,7 +289,7 @@ public class StaffService extends BaseService<Staff> {
             warehouse.setWhName(m.get("whName").toString());
             warehouse.setDisplayNo((Integer) m.get("displayNo"));
             warehouse.setFlgDefault((Boolean) m.get("flgDefault"));
-            warehouse.setCpId((Integer) m.get("cpId"));
+            warehouse.setCpId(cpId);
             warehouse.setOpCreateUserId(m.get("opCreateUserId").toString());
             listW.add(warehouse);
         }
@@ -274,7 +304,7 @@ public class StaffService extends BaseService<Staff> {
             saleChannel.setChannelName(m.get("channelName").toString());
             saleChannel.setDisplayNo((Integer) m.get("displayNo"));
             saleChannel.setFlgDefault((Boolean) m.get("flgDefault"));
-            saleChannel.setCpId((Integer) m.get("cpId"));
+            saleChannel.setCpId(cpId);
             saleChannel.setOpCreateUserId(m.get("opCreateUserId").toString());
             listSc.add(saleChannel);
         }
@@ -290,7 +320,7 @@ public class StaffService extends BaseService<Staff> {
             dictionaryData.setDataValue(m.get("dataValue").toString());
             dictionaryData.setDisplayNo((Integer) m.get("displayNo"));
             dictionaryData.setFlgDefault((Boolean) m.get("flgDefault"));
-            dictionaryData.setCpId((Integer) m.get("cpId"));
+            dictionaryData.setCpId(cpId);
             dictionaryData.setOpCreateUserId(m.get("opCreateUserId").toString());
             listDD.add(dictionaryData);
         }
@@ -305,7 +335,7 @@ public class StaffService extends BaseService<Staff> {
             unit.setUnitName(m.get("unitName").toString());
             unit.setDecimalPlaces((Integer) m.get("decimalPlaces"));
             unit.setDisplayNo((Integer) m.get("displayNo"));
-            unit.setCpId((Integer) m.get("cpId"));
+            unit.setCpId(cpId);
             unit.setOpCreateUserId(m.get("opCreateUserId").toString());
             listU.add(unit);
         }
@@ -335,7 +365,7 @@ public class StaffService extends BaseService<Staff> {
             goodsCategory.setLevelCode(m.get("levelCode") + "");
             goodsCategory.setLevelName(m.get("levelName") + "");
             goodsCategory.setDisplayNo((Integer) m.get("displayNo"));
-            goodsCategory.setCpId((Integer) m.get("cpId"));
+            goodsCategory.setCpId(cpId);
             goodsCategory.setOpCreateUserId(m.get("opCreateUserId").toString());
             listG.add(goodsCategory);
         }