init: init project step4: biz code support

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

@@ -3,10 +3,9 @@ package com.qunzhixinxi.hnqz.admin.api.entity;
 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 lombok.Data;
-import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -17,106 +16,111 @@ import java.time.LocalDateTime;
  */
 @Data
 @TableName("wm_report")
-@EqualsAndHashCode(callSuper = true)
-public class WmReport extends Model<WmReport> {
-	private static final long serialVersionUID = 1L;
+public class WmReport implements Serializable {
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 主键id
-	 */
-	@TableId
-	private Integer id;
-	/**
-	 * 报告单号
-	 */
-	private String reportNo;
-	/**
-	 * 结算药企ID
-	 */
-	private Integer drugEntId;
-	/**
-	 * 积分包ID
-	 */
-	private Integer scoreId;
-	/**
-	 * 申请结算药企ID
-	 */
-	private Integer applyDrugEntId;
-	/**
-	 * 积分包值
-	 */
-	private String packageScore;
-	/**
-	 * 任务数量
-	 */
-	private String taskNumber;
-	/**
-	 * 合计分值
-	 */
-	private String totalScore;
-	/**
-	 * 报告状态
-	 * 1:待提交，2:已提交待审批 3:已审批待结单 4:已结单
-	 */
-	private String reportStatus;
+    /**
+     * 主键id
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 报告单号
+     */
+    private String reportNo;
+    /**
+     * 结算药企ID
+     */
+    private Integer drugEntId;
+    /**
+     * 积分包ID
+     */
+    private Integer scoreId;
+    /**
+     * 申请结算药企ID
+     */
+    private Integer applyDrugEntId;
+    /**
+     * 积分包值
+     */
+    private String packageScore;
+    /**
+     * 任务数量
+     */
+    private String taskNumber;
+    /**
+     * 合计分值
+     */
+    private String totalScore;
+    /**
+     * 报告状态
+     * 1:待提交，2:已提交待审批 3:已审批待结单 4:已结单
+     */
+    private String reportStatus;
 
-	/**
-	 * 创建人
-	 */
-	private String createPeople;
-	/**
-	 * 创建时间
-	 */
-	private LocalDateTime createTime;
-	/**
-	 * 审核人
-	 */
-	private String approvalPeople;
-	/**
-	 * 审核时间
-	 */
-	private LocalDateTime approvalTime;
-	/**
-	 * 更新人
-	 */
-	private String updatePeople;
-	/**
-	 * 更新时间
-	 */
-	private LocalDateTime updateTime;
-	/**
-	 * 是否删除
-	 * 0:未删除，1:已删除
-	 */
-	private String delFlag;
-	/**
-	 * 备用1
-	 */
-	private String export1;
-	/**
-	 * 备用2
-	 */
-	private String export2;
-	/**
-	 * 备用3
-	 */
-	private String export3;
+    /**
+     * 创建人
+     */
+    private String createPeople;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+    /**
+     * 审核人
+     */
+    private String approvalPeople;
+    /**
+     * 审核时间
+     */
+    private LocalDateTime approvalTime;
+    /**
+     * 更新人
+     */
+    private String updatePeople;
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 是否删除
+     * 0:未删除，1:已删除
+     */
+    private String delFlag;
+    /**
+     * 备用1
+     */
+    private String export1;
+    /**
+     * 备用2
+     */
+    private String export2;
+    /**
+     * 备用3
+     */
+    private String export3;
 
-	/**
-	 * 积分包名称
-	 */
-	@TableField(exist = false)
-	private String scorePackageName;
+    /**
+     * 积分包名称
+     */
+    @TableField(exist = false)
+    private String scorePackageName;
 
-	/**
-	 * 报告状态
-	 */
-	@TableField(exist = false)
-	private WmReportOpt reportOpt;
+    /**
+     * 报告状态
+     */
+    @TableField(exist = false)
+    private WmReportOpt reportOpt;
+
+    /**
+     * excel报告操作状态
+     */
+    @TableField(exist = false)
+    private WmReportOpt excelReportOpt;
 
 	/**
-	 * excel报告操作状态
+	 * 企业名称
 	 */
 	@TableField(exist = false)
-	private WmReportOpt excelReportOpt;
+	private String entName;
 }

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

@@ -121,9 +121,6 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
     private final WmTaskContentConfigMapper wmTaskContentConfigMapper;
     private final WmReportMapper wmReportMapper;
     private final SysUserService sysUserService;
-    private final WmDaDistributionService wmDaDistributionService;
-    private final WmDaPharmacyService wmDaPharmacyService;
-    private final WmDaHospitalService wmDaHospitalService;
     private final WmDeptTaskTypeConfigService wmDeptTaskTypeConfigService;
     private final SysDeptService sysDeptService;
     private final SysDeptRelationMapper sysDeptRelationMapper;
@@ -146,8 +143,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
             return page;
         }
 
-        Set<Integer> scoreIds = records.stream().map(WmReport::getScoreId).collect(Collectors.toSet());
-        List<WmScorePackage> scorePackageList = wmScorePackageService.listByIds(scoreIds);
+        //Set<Integer> scoreIds = records.stream().map(WmReport::getScoreId).collect(Collectors.toSet());
+        //Set<Integer> scoreIds = records.stream().map(WmReport::getScoreId).collect(Collectors.toSet());
+        //List<WmScorePackage> scorePackageList = wmScorePackageService.listByIds(scoreIds);
         //// 积分包对应的审核管理费
         //Map<String, BigDecimal> packageAuditManagFeeRatesMap = scorePackageList.stream()
         //        .collect(Collectors.toMap(WmScorePackage::getId, WmScorePackage::getAuditManagementFeeRates));
@@ -182,7 +180,6 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                     Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
                     opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
                     opt.setTtl(LocalDateTime.now().plusSeconds(expire));
-                    // o = "https://pre.yaoyi.net/admin/sys-file/wmkj/兼职学术信息沟通专员业绩报告(2249)-20211116191527.doc";
                     opt.setLatestUrl(o);
                 }
 
@@ -221,7 +218,6 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                     Long expire = redisTemplate.opsForValue().getOperations().getExpire(excelKey, TimeUnit.SECONDS);
                     excelPpt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
                     excelPpt.setTtl(LocalDateTime.now().plusSeconds(expire));
-                    // o = "https://pre.yaoyi.net/admin/sys-file/wmkj/兼职学术信息沟通专员业绩报告(2249)-20211116191527.doc";
                     excelPpt.setLatestUrl(excelO);
                 }
 
@@ -230,14 +226,18 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                 excelPpt.setStatus(WmReportOpt.WmReportOptStatus.NOT_GENERATE);
             }
             report.setExcelReportOpt(excelPpt);
+            Integer drugEntId = report.getDrugEntId();
+            Integer applyDrugEntId = report.getApplyDrugEntId();
+
+            if (drugEntId != null){
+                SysDept byId = sysDeptService.getById(drugEntId);
+                report.setEntName(byId.getName());
+
+            } else if(applyDrugEntId != null){
+                SysDept byId = sysDeptService.getById(applyDrugEntId);
+                report.setEntName(byId.getName());
+            }
 
-            // 完成积分值(最终完成积分值 = 完成积分值 * (1+审核管理费比例))
-            //int actualScore = new BigDecimal(report.getTotalScore()).multiply(
-            //        packageAuditManagFeeRatesMap.get(String.valueOf(report.getScoreId()))
-            //                .divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
-            //).intValue();
-            //report.setTotalScore(String.valueOf(actualScore));
-            //report.setTotalScore(report.getTotalScore());
         }
 
         return reportListPage;

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

@@ -4,65 +4,67 @@
 
 <mapper namespace="com.qunzhixinxi.hnqz.admin.mapper.WmReportMapper">
 
-	<resultMap id="wmReportMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmReport">
-		<id property="id" column="id"/>
-		<result property="reportNo" column="report_no"/>
-		<result property="drugEntId" column="drug_ent_id"/>
-		<result property="scoreId" column="score_id"/>
-		<result property="applyDrugEntId" column="apply_drug_ent_id"/>
-		<result property="packageScore" column="package_score"/>
-		<result property="taskNumber" column="task_number"/>
-		<result property="totalScore" column="total_score"/>
-		<result property="reportStatus" column="report_status"/>
-		<result property="createPeople" column="create_people"/>
-		<result property="createTime" column="create_time"/>
-		<result property="approvalPeople" column="approval_people"/>
-		<result property="approvalTime" column="approval_time"/>
-		<result property="updatePeople" column="update_people"/>
-		<result property="updateTime" column="update_time"/>
-		<result property="delFlag" column="del_flag"/>
-		<result property="export1" column="export1"/>
-		<result property="export2" column="export2"/>
-		<result property="export3" column="export3"/>
-		<result property="scorePackageName" column="score_package_name"/>
+    <resultMap id="wmReportMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmReport">
+        <id property="id" column="id"/>
+        <result property="reportNo" column="report_no"/>
+        <result property="drugEntId" column="drug_ent_id"/>
+        <result property="scoreId" column="score_id"/>
+        <result property="applyDrugEntId" column="apply_drug_ent_id"/>
+        <result property="packageScore" column="package_score"/>
+        <result property="taskNumber" column="task_number"/>
+        <result property="totalScore" column="total_score"/>
+        <result property="reportStatus" column="report_status"/>
+        <result property="createPeople" column="create_people"/>
+        <result property="createTime" column="create_time"/>
+        <result property="approvalPeople" column="approval_people"/>
+        <result property="approvalTime" column="approval_time"/>
+        <result property="updatePeople" column="update_people"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="export1" column="export1"/>
+        <result property="export2" column="export2"/>
+        <result property="export3" column="export3"/>
+        <result property="scorePackageName" column="score_package_name"/>
 
-	</resultMap>
+    </resultMap>
 
-	<select id="getReportListPage" resultMap="wmReportMap">
-		select p.score_package_name,t.* from wm_report t
-		left join wm_score_package p on p.id=t.score_id
-		<if test="query.drugEntId != null and query.drugEntId !=''">
-			left join sys_dept d on t.drug_ent_id=d.dept_id
-		</if>
-		<if test="query.applyDrugEntId != null and query.applyDrugEntId !=''">
-			left join sys_dept d on t.apply_drug_ent_id=d.dept_id
-		</if>
-
-		where 1=1
-		and t.del_flag=0
-		<if test="queryScoreId != null and queryScoreId !=''">
-			AND p.score_id like CONCAT('%',#{queryScoreId},'%')
-		</if>
-		<if test="queryName != null and queryName !=''">
-			AND d.`name` like CONCAT('%',#{queryName},'%')
-		</if>
-		<if test="query.reportNo != null and query.reportNo !=''">
-			AND t.report_no like CONCAT('%',#{query.reportNo},'%')
-		</if>
-		<if test="query.reportStatus != null and query.reportStatus !=''">
-			AND t.report_status =#{query.reportStatus}
-		</if>
-		<if test="query.drugEntId != null and query.drugEntId !=''">
-			AND t.drug_ent_id =#{query.drugEntId}
-		</if>
-		<if test="query.applyDrugEntId != null and query.applyDrugEntId !=''">
-			AND t.apply_drug_ent_id =#{query.applyDrugEntId}
-		</if>
-		<if test="query.scorePackageName != null and query.scorePackageName !=''">
-			AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
-		</if>
-		order by t.create_time desc
-	</select>
+    <select id="getReportListPage" resultMap="wmReportMap">
+        select p.score_package_name,
+        t.*
+        from wm_report t
+        left join wm_score_package p on p.id=t.score_id
+        <if test="query.drugEntId != null and query.drugEntId !=''">
+            left join sys_dept d on t.drug_ent_id=d.dept_id
+        </if>
+        <if test="query.applyDrugEntId != null and query.applyDrugEntId !=''">
+            left join sys_dept d on t.apply_drug_ent_id=d.dept_id
+        </if>
+        <where>
+            t.del_flag= 0
+            <if test="queryScoreId != null and queryScoreId !=''">
+                AND p.score_id like CONCAT('%',#{queryScoreId},'%')
+            </if>
+            <if test="queryName != null and queryName !=''">
+                AND d.`name` like CONCAT('%',#{queryName},'%')
+            </if>
+            <if test="query.reportNo != null and query.reportNo !=''">
+                AND t.report_no like CONCAT('%',#{query.reportNo},'%')
+            </if>
+            <if test="query.reportStatus != null and query.reportStatus !=''">
+                AND t.report_status =#{query.reportStatus}
+            </if>
+            <if test="query.drugEntId != null and query.drugEntId !=''">
+                AND t.drug_ent_id =#{query.drugEntId}
+            </if>
+            <if test="query.applyDrugEntId != null and query.applyDrugEntId !=''">
+                AND t.apply_drug_ent_id =#{query.applyDrugEntId}
+            </if>
+            <if test="query.scorePackageName != null and query.scorePackageName !=''">
+                AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
+            </if>
+        </where>
+        order by t.create_time desc
+    </select>
 
 
 </mapper>