修复已知问题

This commit is contained in:
2022-05-16 16:39:51 +08:00
parent 8a1288dee0
commit 12c7273f21
11 changed files with 63 additions and 28 deletions

View File

@ -43,19 +43,19 @@ public interface HxWorkPlanMapper {
void updateSelective(HxWorkPlan hxWorkPlan);
/**
* 获取所有已经存在的计划名称
* 获取所有已经存在的项目名称
*
* @return
*/
List<String> getAllExistPlanName();
List<String> getAllProjectName();
/**
* 统计计划名称
*
* @param planName
* @param projectName
* @return
*/
Map getInfoByPlanName(String planName);
Map getInfoByProjectName(String projectName);
/**
* 获取总的未完成数量和率

View File

@ -20,6 +20,10 @@ public class HxWorkPlan implements Serializable {
@Excel(name = "日期", width = 20)
private String todayDate;
@ApiModelProperty(value = "项目名称")
@Excel(name = "项目名称", width = 20)
private String projectName;
@ApiModelProperty(value = "工作计划名称")
@Excel(name = "工作计划名称", width = 20)
private String workPlanName;

View File

@ -126,7 +126,7 @@
</select>
<select id="checkIsExist" resultType="int">
select count("id") from "hx_responsibility_status"
select count("id") from ROOT."hx_responsibility_status"
where "dept_name" = #{deptName} and "responsibility_content" = #{responsibilityContent}
limit 1
</select>

View File

@ -11,6 +11,7 @@
<result column="today_date" jdbcType="VARCHAR" property="todayDate" />
<result column="work_plan_name" jdbcType="VARCHAR" property="workPlanName" />
<result column="dept_name" jdbcType="VARCHAR" property="deptName" />
<result column="project_name" jdbcType="VARCHAR" property="projectName" />
<result column="completed_status" jdbcType="VARCHAR" property="completedStatus" />
</resultMap>
<sql id="Base_Column_List">
@ -19,7 +20,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Dec 14 03:18:44 UTC 2021.
-->
"id", "today_date", "work_plan_name", "dept_name", "completed_status"
"id", "today_date", "work_plan_name", "dept_name", "completed_status","project_name"
</sql>
<select id="selectHxWorkPlanList" resultMap="BaseResultMap">
select
@ -69,6 +70,9 @@
<if test="completedStatus != null">
"completed_status",
</if>
<if test="projectName != null">
"project_name",
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -86,6 +90,9 @@
<if test="completedStatus != null">
#{completedStatus,jdbcType=VARCHAR},
</if>
<if test="projectName != null">
#{projectName}
</if>
</trim>
</insert>
<update id="updateSelective" parameterType="com.ailanyin.model.HxWorkPlan">
@ -124,24 +131,24 @@
from ROOT."hx_work_plan"
where "today_date" = #{todayDate,jdbcType=VARCHAR} and
"work_plan_name" = #{workPlanName,jdbcType=VARCHAR} and
"dept_name" = #{deptName,jdbcType=VARCHAR}
"dept_name" = #{deptName,jdbcType=VARCHAR} and "project_name" = #{projectName}
</select>
<select id="getAllExistPlanName" resultType="string">
select "work_plan_name"
<select id="getAllProjectName" resultType="string">
select "project_name"
from ROOT."hx_work_plan"
group by "work_plan_name"
group by "project_name"
</select>
<select id="getInfoByPlanName" resultType="map">
<select id="getInfoByProjectName" resultType="map">
select count("id") as "total",(select count("id")
from ROOT."hx_work_plan"
where "work_plan_name" = #{planName} and "completed_status" = '已完成') as "completedNum",
where "project_name" = #{projectName} and "completed_status" = '已完成') as "completedNum",
(select count("id")
from ROOT."hx_work_plan"
where "work_plan_name" = #{planName} and "completed_status" = '已完成') * 100/count("id") as "rate"
where "project_name" = #{projectName} and "completed_status" = '已完成') * 100/count("id") as "rate"
from ROOT."hx_work_plan"
where "work_plan_name" = #{planName}
where "project_name" = #{projectName}
</select>
<select id="getTotalAndRate" resultType="map">