结算统计调整

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSettleController.java

@@ -82,6 +82,7 @@ public class CmcSettleController extends BaseController
      */
     @GetMapping("/statistic")
     public AjaxResult getSettleStatistic(CmcSettle cmcSettle) throws ParseException {
+        cmcSettle.setContent("实际结算总金额");
         JSONObject jsonObject = new JSONObject();
         JSONArray yearArray = new JSONArray();
         JSONObject yearObject = new JSONObject();

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcSettle.java

@@ -36,6 +36,9 @@ public class CmcSettle extends BaseEntity
     @Excel(name = "其他项目名称")
     private String xmName;
 
+    /** 结算内容 */
+    private String content;
+
     /** 实际结算总金额 */
     @Excel(name = "实际结算总金额")
     private BigDecimal amount;
@@ -556,6 +559,15 @@ public class CmcSettle extends BaseEntity
     {
         return amount;
     }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
 
 
     @Override

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="modifyDocument"    column="modify_document"    />
         <result property="finalDocument"    column="final_document"    />
         <result property="amount"    column="amount"    />
+        <result property="content"    column="content"    />
         <association property="reportUser"    javaType="SysUser"         resultMap="ReportUserResult" />
         <association property="zhUser"    javaType="SysUser"         resultMap="ZhUserResult" />
         <association property="jsUser"    javaType="SysUser"         resultMap="JsUserResult" />
@@ -115,7 +116,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
         <where>
-            ss.content = '实际结算总金额'
             <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
             <if test="projectId != null"> and s.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
@@ -149,8 +149,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectCmcSettleBySettleId" parameterType="String" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
-        group by s.settle_id
         where s.settle_id = #{settleId}
+        group by s.settle_id
     </select>
         
     <insert id="insertCmcSettle" parameterType="CmcSettle">