Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/controller/mac/AccountController.java

@@ -80,4 +80,15 @@ public class AccountController extends BaseController<Account> {
     public ResponseResultVO<?> getPayableAccountItem(@RequestBody AccountItemQuery accountItemQuery) {
         return accountService.getPayableAccountItem(accountItemQuery);
     }
+
+    /**
+     * @desc : 查询应收收款总额（制单员权限）
+     * @author : 周兴
+     * @date : 2024/4/3 10:36
+     */
+    @ApiOperation(value = "查询应收收款总额（制单员权限）", notes = "查询应收收款总额（制单员权限）")
+    @PostMapping({"get_receivable_account_sum"})
+    public ResponseResultVO<?> getReceivableAccountSum(@RequestBody AccountItemQuery accountItemQuery) {
+        return accountService.getReceivableAccountSum(accountItemQuery);
+    }
 }

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.mst.StaffPurviewService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -69,4 +70,14 @@ public class StaffPurviewController{
         return staffService.saveStaffPurview(staffVO);
     }
 
+    /**
+     * @desc   : 保存范围权限
+     * @author : 常皓宁
+     * @date   : 2024/4/3 14:45
+     */
+    @PostMapping("save_purview/{staffId}")
+    public ResponseResultVO savePurview(@RequestBody List<StaffPurview> staffPurviewList, @PathVariable String staffId) {
+        return staffPurviewService.savePurview(staffPurviewList, staffId);
+    }
+
 }

src/main/java/com/dk/mdm/mapper/mac/AccountItemMapper.java

@@ -40,5 +40,12 @@ public interface AccountItemMapper extends BaseMapper<AccountItem>{
      * @date   : 2024-03-09 11:36
      */
     Map<String, Object> getSumAmtRecPay(String id);
+
+    /**
+     * @desc   : 查询应收收款总额（制单员权限）
+     * @author : 周兴
+     * @date   : 2024-04-03 11:36
+     */
+    Map<String, Object> getReceivableAccountSum(AccountItemQuery accountItemQuery);
 }
 

src/main/java/com/dk/mdm/mapper/mac/AccountItemMapper.xml

@@ -159,6 +159,31 @@
     </select>
 
 
+    <!--查询应收和收款汇总（根据制单员权限）-->
+    <select id="getReceivableAccountSum" resultType="Map">
+        SELECT SUM
+                   ( CASE WHEN tmai.acc_item_type = '账款类型-应收' THEN tmai.amt_should ELSE 0 END ) AS receivable,
+               SUM ( CASE WHEN tmai.acc_item_type = '账款类型-收款' THEN tmai.amt_should ELSE 0 END ) AS receipt
+        FROM
+            dkic_b.t_mac_account_item tmai
+        WHERE
+            tmai.flg_valid
+          AND tmai.cp_id = #{cpId}
+          AND (
+                tmai.make_staff = #{staffId}
+                OR EXISTS ( SELECT 1 FROM dkic_b.t_mst_staff_purview tmsp WHERE tmsp.staff_id = tmai.make_staff AND tmsp.purview_code = 'PU10000003' )
+            )
+        <!--开始日期-->
+        <if test="accDateStart != null and accDateStart != ''">
+            AND t.acc_date &gt;= #{accDateStart}
+        </if>
+        <!--截止日期-->
+        <if test="accDateEnd != null and accDateEnd != ''">
+            AND t.acc_date &lt;= #{accDateEnd}
+        </if>
+    </select>
+
+
     <!-- 查询应收账款明细 -->
     <select id="getReceivableAccountItem" resultMap="BaseResultMapResponse">
         SELECT t.item_id,

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

@@ -33,5 +33,12 @@ public interface StaffPurviewMapper extends BaseMapper<StaffPurview>{
      * @date : 2024/2/26 10:36
      */
     int insertOrUpdateCondition(@Param("list") List<StaffPurview> list);
+
+    /**
+     * @desc   : 通过用户删除
+     * @author : 常皓宁
+     * @date   : 2024/4/3 14:45
+     */
+    int deleteByStaff(@Param("staffId") String staffId);
 }
 

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

@@ -163,7 +163,7 @@
 
     <!-- 批量插入   -->
     <insert id="insertOrUpdateCondition">
-        insert into t_mst_staff_purview
+        insert into dkic_b.t_mst_staff_purview
         (
         <trim suffixOverrides=",">
             staff_id,
@@ -190,4 +190,9 @@
         data_ids = excluded."data_ids";
     </insert>
 
+    <!--    通过用户删除-->
+    <delete id="deleteByStaff">
+        delete from  dkic_b.t_mst_staff_purview
+        where Staff_id = #{staffId}::uuid
+    </delete>
 </mapper>

src/main/java/com/dk/mdm/model/query/mac/AccountItemQuery.java

@@ -206,6 +206,24 @@ public class AccountItemQuery extends PageInfo<AccountItemQuery> implements Seri
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
+    /**
+     * 账务开始日期
+     */
+    @Excel(name = "账务开始日期")
+    @ApiModelProperty(value = "账务开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDate accDateStart;
+
+    /**
+     * 账务截止日期
+     */
+    @Excel(name = "账务截止日期")
+    @ApiModelProperty(value = "账务截止日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDate accDateEnd;
+
 
     /**
      * 企业ID

src/main/java/com/dk/mdm/service/mac/AccountService.java

@@ -499,6 +499,16 @@ public class AccountService extends BaseService<Account> {
         super.updateByUuid(accountUpdate);
     }
 
+    /**
+     * @desc : 获取应收，收款汇总（制单员权限）
+     * @author : 中兴
+     * @date : 2024-04-03 16:32
+     */
+    public ResponseResultVO<?> getReceivableAccountSum(AccountItemQuery accountItemQuery){
+        Map<String, Object> receivableAccountMap= accountItemMapper.getReceivableAccountSum(accountItemQuery);
+        return ResponseResultUtil.success(receivableAccountMap);
+    }
+
     /*********************  账款部分共通方法 end **********************/
 
 

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

@@ -64,4 +64,20 @@ public class StaffPurviewService extends BaseService<StaffPurview> {
 		return  ResponseResultUtil.success(staffPurviewMapper.deleteById(new StaffRight().setStaffId(id)) > 0) ;
 	}
 
+	/**
+	 * @desc   : 保存范围权限
+	 * @author : 常皓宁
+	 * @date   : 2024/4/3 14:45
+	 */
+	@Transactional(rollbackFor = {Exception.class})
+	public ResponseResultVO savePurview(List<StaffPurview> staffPurviewList, String staffId) {
+//		通过用户删除
+		staffPurviewMapper.deleteByStaff(staffId);
+		if (staffPurviewList.size() > 0) {
+			//		保存
+			staffPurviewMapper.insertOrUpdateCondition(staffPurviewList);
+		}
+		return ResponseResultUtil.success();
+	}
+
 }