Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java

@@ -93,6 +93,8 @@ public class FeeConfigDto extends PageDto implements Serializable {
 
     private String payerObjType;
 
+    private String deleteFlag;
+
 
     public String getFeeTypeCd() {
         return feeTypeCd;
@@ -375,4 +377,12 @@ public class FeeConfigDto extends PageDto implements Serializable {
     public void setPayerObjType(String payerObjType) {
         this.payerObjType = payerObjType;
     }
+
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
 }

java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml

@@ -337,8 +337,16 @@
         left join c_business cb on t.b_id = cb.b_id
         left join c_orders co on cb.o_id = co.o_id
         left join u_user uu on co.user_id = uu.user_id
+        <if test="deleteFlag != null and deleteFlag != ''">
+            inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '1' and pfc.b_id = t.b_id
+        </if>
         where 1=1
-        and t.config_id = #{configId}
+        <if test="configId != null and configId != ''">
+            and t.config_id = #{configId}
+        </if>
+        <if test="deleteFlag != null and deleteFlag != ''">
+            and t.operate = 'DEL'
+        </if>
         and t.community_id = #{communityId}
     </select>
 
@@ -364,8 +372,16 @@
         = 'bill_type'
         left join t_dict td4 on t.computing_formula = td4.status_cd and td4.table_name = 'pay_fee_config' and
         td4.table_columns = 'computing_formula'
+        <if test="deleteFlag != null and deleteFlag != ''">
+            inner join pay_fee_config pfc on t.config_id = pfc.config_id and pfc.status_cd = '1' and pfc.b_id = t.b_id
+        </if>
         where 1=1
+        <if test="configId != null and configId != ''">
         and t.config_id = #{configId}
+        </if>
+        <if test="deleteFlag != null and deleteFlag != ''">
+            and t.operate = 'DEL'
+        </if>
         and t.community_id = #{communityId}
         order by t.create_time desc,t.operate
         <if test="page != -1 and page != null ">

service-report/src/main/java/com/java110/report/cmd/fee/QueryHisFeeConfigCmd.java

@@ -23,7 +23,7 @@ import java.util.List;
  * 查询收费项目 变更记录
  */
 @Java110Cmd(serviceCode = "fee.queryHisFeeConfig")
-public class QueryHisFeeConfigCmd extends Cmd{
+public class QueryHisFeeConfigCmd extends Cmd {
 
     @Autowired
     private IReportCommunityInnerServiceSMO reportCommunityInnerServiceSMOImpl;
@@ -31,8 +31,14 @@ public class QueryHisFeeConfigCmd extends Cmd{
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
 
-        Assert.hasKeyAndValue(reqJson,"configId","未包含费用ID");
-        Assert.hasKeyAndValue(reqJson,"communityId","未包含小区");
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
+
+        if (reqJson.containsKey("deleteFlag")) {
+            return;
+        }
+
+        Assert.hasKeyAndValue(reqJson, "configId", "未包含费用ID");
+
     }
 
     @Override