Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

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

@@ -22,10 +22,8 @@ public class UnitController{
     public BaseService<Unit> getService() {
         return unitService;
     }
-
     @Autowired
     private UnitService unitService;
-
     /**
      * @desc : 条件查询
      * @author : 于继渤
@@ -36,8 +34,6 @@ public class UnitController{
     public ResponseResultVO<PageList<UnitResponse>> selectByCond(@RequestBody UnitQuery UnitQuery) {
         return unitService.selectByCond(UnitQuery);
     }
-
-
     /**
      * @desc : 新建
      * @author : 于继渤
@@ -48,10 +44,6 @@ public class UnitController{
     public ResponseResultVO<?> insert(@RequestBody UnitVO unitVO) {
         return unitService.insert(unitVO);
     }
-
-
-
-
     /**
      * @desc : 编辑
      * @author : 于继渤
@@ -71,7 +63,6 @@ public class UnitController{
     public ResponseResultVO<Boolean> disable(@PathVariable String id) {
         return this.getService().disable(id);
     }
-
     /**
      * @desc : 启用
      * @author : 于继渤

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

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, mac_id, flow_type, invoice_id, amt_inflow, acc_date, remarks, make_staff, make_time, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, mac_id, flow_type, invoice_id, amt_inflow, acc_date, remarks, make_staff, make_time, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -21,13 +21,6 @@
                 <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="cp_id" property="cpId"/>
-                <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
-                <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
-                <result column="op_app_code" property="opAppCode"/>
-                <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
-                <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -63,27 +56,6 @@
             <if test="cpId != null">
                 AND cp_id = #{cpId}
             </if>
-            <if test="opCreateTime != null">
-                AND op_create_time = #{opCreateTime}
-            </if>
-            <if test="opCreateUserId != null and opCreateUserId != ''">
-                AND op_create_user_id = #{opCreateUserId}
-            </if>
-            <if test="opUpdateTime != null">
-                AND op_update_time = #{opUpdateTime}
-            </if>
-            <if test="opUpdateUserId != null and opUpdateUserId != ''">
-                AND op_update_user_id = #{opUpdateUserId}
-            </if>
-            <if test="opAppCode != null and opAppCode != ''">
-                AND op_app_code = #{opAppCode}
-            </if>
-            <if test="opTimestamp != null">
-                AND op_timestamp = #{opTimestamp}
-            </if>
-            <if test="opDbUser != null and opDbUser != ''">
-                AND op_db_user = #{opDbUser}
-            </if>
         </where>
     </sql>
 
@@ -99,7 +71,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -110,7 +82,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         <include refid="Condition"/>
     </select>
 
@@ -118,7 +90,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         WHERE item_id = #{id}::uuid
     </select>
 
@@ -126,7 +98,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         WHERE item_id = #{id}::uuid
         for update
     </select>
@@ -135,7 +107,7 @@
     <select id="selectByInvoiceIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         WHERE invoice_id = #{id}::uuid
         for update
     </select>
@@ -144,13 +116,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_mst_money_account_item
+        insert into dkic_b.t_mst_money_account_item
         (
         <trim suffixOverrides=",">
             mac_id,

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

@@ -226,7 +226,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account
+        FROM dkic_b.t_mst_money_account
         WHERE mac_id = #{id}::uuid
         for update
     </select>

src/main/java/com/dk/mdm/model/pojo/mac/Account.java

@@ -30,7 +30,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("账款对象")
-@TableName(value = "t_mac_account", autoResultMap = true)
+@TableName(value = "t_mac_account", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：账款对象", description="表名：t_mac_account")
 public class Account extends PageInfo<Account> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/AccountItem.java

@@ -29,7 +29,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("账务明细")
-@TableName(value = "t_mac_account_item", autoResultMap = true)
+@TableName(value = "t_mac_account_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：账务明细", description="表名：t_mac_account_item")
 public class AccountItem extends PageInfo<AccountItem> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/MacTransfer.java

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("资金转账")
-@TableName(value = "t_mac_transfer", autoResultMap = true)
+@TableName(value = "t_mac_transfer", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：资金转账", description="表名：t_mac_transfer")
 public class MacTransfer extends PageInfo<MacTransfer> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/MacTransferItem.java

@@ -28,7 +28,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("资金转账明细")
-@TableName(value = "t_mac_transfer_item", autoResultMap = true)
+@TableName(value = "t_mac_transfer_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：资金转账明细", description="表名：t_mac_transfer_item")
 public class MacTransferItem extends PageInfo<MacTransferItem> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/OtherPayable.java

@@ -32,7 +32,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("其他支出单")
-@TableName(value = "t_mac_other_payable", autoResultMap = true)
+@TableName(value = "t_mac_other_payable", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：其他支出单", description="表名：t_mac_other_payable")
 public class OtherPayable extends PageInfo<OtherPayable> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/OtherPayableItem.java

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("其他支出明细")
-@TableName(value = "t_mac_other_payable_item", autoResultMap = true)
+@TableName(value = "t_mac_other_payable_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：其他支出明细", description="表名：t_mac_other_payable_item")
 public class OtherPayableItem extends PageInfo<OtherPayableItem> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/OtherReceivable.java

@@ -31,7 +31,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("其他收入单")
-@TableName(value = "t_mac_other_receivable", autoResultMap = true)
+@TableName(value = "t_mac_other_receivable", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：其他收入单", description="表名：t_mac_other_receivable")
 public class OtherReceivable extends PageInfo<OtherReceivable> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/OtherReceivableItem.java

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("其他收入明细")
-@TableName(value = "t_mac_other_receivable_item", autoResultMap = true)
+@TableName(value = "t_mac_other_receivable_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：其他收入明细", description="表名：t_mac_other_receivable_item")
 public class OtherReceivableItem extends PageInfo<OtherReceivableItem> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/RecPay.java

@@ -32,7 +32,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("收付款单")
-@TableName(value = "t_mac_rec_pay", autoResultMap = true)
+@TableName(value = "t_mac_rec_pay", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：收付款单", description="表名：t_mac_rec_pay")
 public class RecPay extends PageInfo<RecPay> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/RecPayHandleItem.java

@@ -28,7 +28,7 @@ import java.time.LocalDate;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("账务冲抵明细")
-@TableName(value = "t_mac_rec_pay_handle_item", autoResultMap = true)
+@TableName(value = "t_mac_rec_pay_handle_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：账务冲抵明细", description="表名：t_mac_rec_pay_handle_item")
 public class RecPayHandleItem extends PageInfo<RecPayHandleItem> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mac/RecPayItem.java

@@ -31,7 +31,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("收付款单明细")
-@TableName(value = "t_mac_rec_pay_item", autoResultMap = true)
+@TableName(value = "t_mac_rec_pay_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：收付款单明细", description="表名：t_mac_rec_pay_item")
 public class RecPayItem extends PageInfo<RecPayItem> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mst/MoneyAccount.java

@@ -29,7 +29,7 @@ import java.time.LocalDate;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("资金账户")
-@TableName(value = "t_mst_money_account", autoResultMap = true)
+@TableName(value = "t_mst_money_account", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：资金账户", description="表名：t_mst_money_account")
 public class MoneyAccount extends PageInfo<MoneyAccount> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/mst/MoneyAccountItem.java

@@ -29,7 +29,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("资金流水明细")
-@TableName(value = "t_mst_money_account_item", autoResultMap = true)
+@TableName(value = "t_mst_money_account_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：资金流水明细", description="表名：t_mst_money_account_item")
 public class MoneyAccountItem extends PageInfo<MoneyAccountItem> implements Serializable {
 
@@ -134,69 +134,6 @@ public class MoneyAccountItem extends PageInfo<MoneyAccountItem> implements Seri
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/pojo/sale/MultiOwner.java

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("多业务归属")
-@TableName(value = "t_psi_multi_owner", autoResultMap = true)
+@TableName(value = "t_psi_multi_owner", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：多业务归属", description="表名：t_psi_multi_owner")
 public class MultiOwner extends PageInfo<MultiOwner> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/sale/Order.java

@@ -31,7 +31,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("销售订单")
-@TableName(value = "t_psi_order", autoResultMap = true)
+@TableName(value = "t_psi_order", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：销售订单", description="表名：t_psi_order")
 public class Order extends PageInfo<Order> implements Serializable {
 

src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("销售明细")
-@TableName(value = "t_psi_order_item", autoResultMap = true)
+@TableName(value = "t_psi_order_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：销售明细", description="表名：t_psi_order_item")
 public class OrderItem extends PageInfo<OrderItem> implements Serializable {
 

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

@@ -99,18 +99,16 @@ public class CustomerService extends BaseService<Customer> {
                     ErrorCodeEnum.CUSTOMER_SAME_COMPANY_TELEPHONE.getMessage());
         }
         List<String> followStaff = new ArrayList<>();
-        followStaff.add(authUtils.getStaff().getStaffId());
+        String staffId = authUtils.getStaff().getStaffId();
+        followStaff.add(staffId);
         customer.setFollowStaffs(followStaff);
         if (customer.getSaleStatus() == null) {
             //新建默认就是潜客
             customer.setSaleStatus(Constant.saleCustomerStatusConstant.SALE_STATUS_POTE.getName());
         }
 
-
-        //设置公司id
-//        customer.setCpId(authUtils.getStaff().getCpId());
         //报备人
-        customer.setReportStaff(authUtils.getStaff().getStaffId());
+        customer.setReportStaff(staffId);
         //报备日期
         customer.setReportTime(LocalDateTime.now());
         ResponseResultVO<?> insert = super.insert(customer);

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

@@ -45,9 +45,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 
 	@Autowired
 	private DictionaryDataConvert dictionaryDataConvert;
-
-	@Autowired
-	private MoneyAccountMapper moneyAccountMapper;
 	/**
 	 * @desc : 重写主键
 	 * @author : 于继渤
@@ -57,8 +54,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 	public String getPrimaryKey() {
 		return "data_id";
 	}
-
-
 	/**
 	 * @desc : 查询
 	 * @author : 于继渤
@@ -69,8 +64,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 		return super.mergeListWithCount(dictionaryDataQuery, dictionaryDataMapper.selectByCond(dictionaryDataQuery),
 				dictionaryDataMapper.countByCond(dictionaryDataQuery));
 	}
-
-
 	public ResponseResultVO<Long> countByCondMoneyAccount(String id) {
 		Long aLong = dictionaryDataMapper.countByCondMoneyAccount(id);
 		return ResponseResultUtil.success(aLong);
@@ -98,9 +91,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 		dictionaryDataMapper.insert(dictionaryData);
 		return ResponseResultUtil.success();
 	}
-
-
-
 	/**
 	 * @desc : 编辑
 	 * @author : 于继渤
@@ -121,10 +111,7 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 			//默认  把其他置为非默认
 			dictionaryDataMapper.updateFlgDefault(new DictionaryDataQuery().setCpId(dictionaryData1.getCpId()).setDictCode(dictionaryData1.getDictCode()));
 		}
-
-
 		super.updateByUuid(dictionaryData);
-
 		return ResponseResultUtil.success();
 	}
 
@@ -162,7 +149,6 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
 			return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SYSTEM_PRESET_DATA_UNABLE_TO_OPERATE.getMessage());
 		}
 		super.enable(id);
-
 		return ResponseResultUtil.success();
 	}
 

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

@@ -98,7 +98,11 @@ public class RoleService extends BaseService<Role> {
 
         return ResponseResultUtil.success();
     }
-
+    /**
+     * @desc : 设置功能权限敏感数据
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
     private void setRoleItem(RoleVo roleVO, Role role) {
         if (roleVO.getRoleFunList() != null && roleVO.getRoleFunList().size() > 0 && roleVO.getRoleFunList().get(0).getFunUuid() != null) {
             //新建角色功能权限

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

@@ -47,9 +47,6 @@ public class UnitService extends BaseService<Unit> {
 	public String getPrimaryKey() {
 		return "unit_id";
 	}
-
-
-
 	/**
 	 * @desc : 查询
 	 * @author : 于继渤
@@ -60,9 +57,6 @@ public class UnitService extends BaseService<Unit> {
 		return super.mergeListWithCount(UnitQuery, unitMapper.selectByCond(UnitQuery),
 				unitMapper.countByCond(UnitQuery));
 	}
-
-
-
 	/**
 	 * @desc : 新建
 	 * @author : 于继渤
@@ -82,7 +76,6 @@ public class UnitService extends BaseService<Unit> {
 		unit.setUnitCode(uniqueNoteCode.get("outNote").toString());
 		//新建
 		unitMapper.insert(unit);
-
 		return ResponseResultUtil.success();
 	}