feat: 财务复核功能-复核方式设置

db/v2.0/20240105.sql

@@ -0,0 +1,2 @@
+alter table sys_dept
+    add financial_review_type char(10) default 'AUTO' null comment '财务复核方式';

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/UpmsType.java

@@ -260,4 +260,29 @@ public final class UpmsType {
 		 */
 		private final String description;
 	}
+
+	/**
+	 * 财务复核方式
+	 *
+	 * @author lixuesong
+	 * @date 2024/01/05
+	 */
+	@Getter
+	@AllArgsConstructor
+	public enum FinancialReviewType {
+		AUTO("AUTO", "自动"),
+		MANUAL("MANUAL", "手动");
+
+		/**
+		 * 类型
+		 */
+		@EnumValue
+		private final String type;
+
+		/**
+		 * 描述
+		 */
+		private final String description;
+
+	}
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDept.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -152,4 +153,9 @@ public class SysDept extends Model<SysDept> {
 	 */
 	private Integer renlijiaServiceChargeRate;
 
+	/**
+	 * 财务复核方式
+	 */
+	private UpmsType.FinancialReviewType financialReviewType;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaDrugEntController.java

@@ -242,6 +242,7 @@ public class WmDaDrugEntController {
 
 		sysDept.setSubjectType(wmDaDrugEnt.getSubjectType());
 		sysDept.setDeptPermissions(wmDaDrugEnt.getDeptPermissions());
+		sysDept.setFinancialReviewType(wmDaDrugEnt.getFinancialReviewType());
 		sysDeptMapper.updateByPrimaryKeySelective(sysDept);
 		SysUser sysUserCondition = new SysUser();
 		sysUserCondition.setDeptId(Integer.parseInt(wmDaDrugEnt.getDeptId()));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmDaAgent.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -162,4 +163,10 @@ public class WmDaAgent extends Model<WmDaAgent> {
 	 */
 	@TableField(exist = false)
 	private Integer deptLevel;
+
+	/**
+	 * 财务复核方式(字段存于sys_dept表)
+	 */
+	@TableField(exist = false)
+	private UpmsType.FinancialReviewType financialReviewType;
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmDaDrugEnt.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -97,4 +98,10 @@ public class WmDaDrugEnt extends Model<WmDaDrugEnt> {
 	@TableField(exist = false)
 	private String[] deptPermissions;
 
+	/**
+	 * 财务复核方式(字段存于sys_dept表)
+	 */
+	@TableField(exist = false)
+	private UpmsType.FinancialReviewType financialReviewType;
+
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -348,6 +348,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 			sysDept.setTaxCode(wmDaAgent.getZjNumber());
 			sysDept.setSubjectType(wmDaAgent.getSubjectType());
 			sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
+			sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
 			if (wmDaAgent.getQylx().contains("0")) {
 				sysDept.setName(wmDaAgent.getGsmc());
 				sysDept.setLevel(3);
@@ -623,6 +624,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 		 */
 		sysDept.setSubjectType(wmDaAgent.getSubjectType());
 		sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
+		sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
 		sysDeptMapper.updateByPrimaryKeySelective(sysDept);
 		SysUser sysUser1 = new SysUser();
 		sysUser1.setDeptId(Integer.parseInt(wmDaAgent.getDeptId()));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -81,6 +81,8 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 			sysDept.setLevel1Name(entity.getEntname());
 			sysDept.setSubjectType(entity.getSubjectType());
 			sysDept.setTaxCode(entity.getEntcode());
+			sysDept.setFinancialReviewType(entity.getFinancialReviewType());
+			sysDept.setDeptPermissions(entity.getDeptPermissions());
 			/**
 			 * @Modify: start
 			 * @Author: ryz

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysDeptMapper.xml

@@ -173,6 +173,9 @@
 			<if test="deptPermissions != null and deptPermissions != ''">
 				dept_permissions = #{deptPermissions, jdbcType=VARCHAR}
 			</if>
+			<if test="financialReviewType != null">
+				financial_review_type = #{financialReviewType.type, jdbcType=CHAR}
+			</if>
 		</set>
 		where dept_id = #{deptId,jdbcType=BIGINT}
 	</update>

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmDaAgentMapper.xml

@@ -75,7 +75,7 @@
 	<!-- 分页查询派工企业 -->
 	<select id="selectWmManagementPage" resultMap="wmDaAgentMap">
 		SELECT
-		a.*, d.dept_permissions, d.level as dept_level
+		a.*, d.dept_permissions, d.level as dept_level, d.financial_review_type
 		FROM wm_da_agent a
 		LEFT JOIN sys_dept d ON d.dept_id = a.dept_id
 		<where>

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmDaDrugEntMapper.xml

@@ -64,7 +64,8 @@
 			e.pgqx,
 			e.management,
 			e.subject_type,
-			d.dept_permissions
+			d.dept_permissions,
+			d.financial_review_type
 		FROM wm_da_drug_ent e LEFT JOIN sys_dept d ON e.dept_id=d.dept_id
 		<where>
 			<if test="query.entname != null and query.entname != ''">