修改查询没生效和显示erp作业中心的问题

liweidong
wupeng 2 days ago
parent a3a6a8bf6d
commit 90dc879d5b
  1. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/cost/controller/SubjectFeeDetailController.java
  2. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/cost/mapper/CostStatisticsMapper.xml

@ -191,6 +191,10 @@ public class SubjectFeeDetailController extends BladeController {
if ("辅助人员材料费用".equals(subjectName)) { if ("辅助人员材料费用".equals(subjectName)) {
iterator.remove(); // 只有迭代器的 remove 才安全 iterator.remove(); // 只有迭代器的 remove 才安全
} }
// 如果“erp作业中心材料费用”,删除
if ("erp作业中心材料费用".equals(subjectName)) {
iterator.remove(); // 只有迭代器的 remove 才安全
}
} }
} }
return R.data(list); return R.data(list);

@ -25,6 +25,7 @@
<result column="REMARKS" property="remarks"/> <result column="REMARKS" property="remarks"/>
<result column="STATUS" property="status"/> <result column="STATUS" property="status"/>
<result column="IS_DELETED" property="isDeleted"/> <result column="IS_DELETED" property="isDeleted"/>
<result column="JC_ID" property="jcId"/>
</resultMap> </resultMap>
@ -35,6 +36,9 @@
<if test="param2.month != null and param2.month != ''"> <if test="param2.month != null and param2.month != ''">
and MONTH = #{param2.month} and MONTH = #{param2.month}
</if> </if>
<if test="param2.jcId != null and param2.jcId != ''">
and JC_ID = #{param2.jcId}
</if>
</where> </where>
</select> </select>

Loading…
Cancel
Save