kangwei: 完善接口

@@ -14,6 +14,7 @@ import com.skua.core.util.DateUtils;
 import com.skua.modules.common.service.ICommonSqlService;
 import com.skua.modules.common.service.ICommonSqlService;
 import com.skua.modules.erp.entity.ErpSettlement;
 import com.skua.modules.erp.entity.ErpSettlement;
 import com.skua.modules.erp.entity.ErpSettlementItem;
 import com.skua.modules.erp.entity.ErpSettlementItem;
+import com.skua.modules.erp.entity.MaterialIN;
 import com.skua.modules.erp.service.IErpSettlementService;
 import com.skua.modules.erp.service.IErpSettlementService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -255,13 +256,13 @@ public class ErpSettlementController {
 
 
 	@AutoLog(value = "药剂结算单详情-审批")
 	@AutoLog(value = "药剂结算单详情-审批")
 	@ApiOperation(value="药剂结算单详情-审批", notes="药剂结算单详情-审批")
 	@ApiOperation(value="药剂结算单详情-审批", notes="药剂结算单详情-审批")
-	@GetMapping(value = "/audit")
-	public Result<?> audit(@RequestParam(name="id",required=true) String id,Integer auditStatus ,String approveMessage ) {
+	@PutMapping(value = "/audit")
+	public Result<?> audit(@RequestBody ApprovalRecordVO  approvalRecordVO ) {
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
 		Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
-		ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
+		ErpSettlement erpSettlementEntity = erpSettlementService.getById(approvalRecordVO.getId());
 		erpSettlementEntity.setInspectTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
 		erpSettlementEntity.setInspectTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
-		erpSettlementEntity.setAuditStatus(auditStatus);
-		erpSettlementEntity.setApproveMessage(approveMessage);
+		erpSettlementEntity.setAuditStatus(Integer.parseInt(approvalRecordVO.getAuditStatus()));
+		erpSettlementEntity.setApproveMessage(approvalRecordVO.getApproveMessage());
 		erpSettlementEntity.setInspectorSign(BaseContextHandler.getUserName());
 		erpSettlementEntity.setInspectorSign(BaseContextHandler.getUserName());
 		if(erpSettlementEntity==null) {
 		if(erpSettlementEntity==null) {
 			result.error500("未找到对应实体");
 			result.error500("未找到对应实体");

@@ -374,7 +374,7 @@ public class MaterialINController {
 	@AutoLog(value = "erp--药剂入库-回退")
 	@AutoLog(value = "erp--药剂入库-回退")
 	@ApiOperation(value="erp--药剂入库-回退", notes="erp--药剂入库-回退")
 	@ApiOperation(value="erp--药剂入库-回退", notes="erp--药剂入库-回退")
 	@PutMapping(value = "/rollback")
 	@PutMapping(value = "/rollback")
-	public Result<MaterialIN> rollback(ApprovalRecordVO  approvalRecordVO) {
+	public Result<MaterialIN> rollback(@RequestBody ApprovalRecordVO  approvalRecordVO) {
 		Result<MaterialIN> result = new Result<MaterialIN>();
 		Result<MaterialIN> result = new Result<MaterialIN>();
 		MaterialIN  materialIN = null;
 		MaterialIN  materialIN = null;
 		result.setSuccess(true);//默认成功！
 		result.setSuccess(true);//默认成功！

@@ -208,7 +208,7 @@ public class EquipmentInfoMonthReportController {
         sql += "   )aaa  left join sys_depart d on aaa.depart_id = d.id  ";
         sql += "   )aaa  left join sys_depart d on aaa.depart_id = d.id  ";
 
 
         if(StringUtils.isNotEmpty(departIds)){
         if(StringUtils.isNotEmpty(departIds)){
-            sql += "  and aaa.id in ("+ JSUtils.quoteEach(departIds,",") +") ";
+            sql += "  and aaa.depart_id in ("+ JSUtils.quoteEach(departIds,",") +") ";
         }
         }
         return commonSqlService.queryForList(sql);
         return commonSqlService.queryForList(sql);
     }
     }
@@ -226,7 +226,7 @@ public class EquipmentInfoMonthReportController {
         sql += "   where t.install_date  >= '"+startDate+"' and t.install_date <= '"+endDate+"'  ";
         sql += "   where t.install_date  >= '"+startDate+"' and t.install_date <= '"+endDate+"'  ";
         sql += ")aaa  left join sys_depart d on aaa.depart_id = d.id     ";
         sql += ")aaa  left join sys_depart d on aaa.depart_id = d.id     ";
         if(StringUtils.isNotEmpty(departIds)){
         if(StringUtils.isNotEmpty(departIds)){
-            sql += "  and aaa.id in ("+ JSUtils.quoteEach(departIds,",") +") ";
+            sql += "  and aaa.depart_id in ("+ JSUtils.quoteEach(departIds,",") +") ";
         }
         }
         return commonSqlService.queryForList(sql);
         return commonSqlService.queryForList(sql);
     }
     }

@@ -91,7 +91,7 @@
     </select>
     </select>
     <select id="getMaintainCost" parameterType="java.lang.String" resultType="java.lang.Double">
     <select id="getMaintainCost" parameterType="java.lang.String" resultType="java.lang.Double">
         SELECT
         SELECT
-            IFNULL(SUM(emt.material_cost),0) AS cost
+            IFNULL(SUM(emt.maintenance_cost),0) AS cost
         FROM
         FROM
             equipment_maintain_task emt
             equipment_maintain_task emt
         WHERE
         WHERE

@@ -46,7 +46,8 @@ public class SysBaseConfigController {
 
 
 	/**
 	/**
 	 * <pre>
 	 * <pre>
-	 * 	 查询基础配置信息
+	 * 	 查询基础
+	 * 	 配置信息
 	 * </pre>
 	 * </pre>
 	 * @return
 	 * @return
 	 * @author xiechao
 	 * @author xiechao