Commit 02cac15c authored by zhengjiawei's avatar zhengjiawei

消防整改 注解

parent bae66871
......@@ -6,7 +6,7 @@ import lombok.Data;
import java.util.List;
@Data
@ApiModel(description = "消防整改 消防要求实体类")
@ApiModel(description = "消防整改 单据修改实体类")
public class FireParamBo {
private List<FireMoreDataBo> warnningData;
private List<FireMoreDataBo> hiddenData;
......
......@@ -14,11 +14,9 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
......
......@@ -8,16 +8,30 @@ import java.util.List;
import java.util.Map;
public interface FireRectificationMapper extends BaseMapper{
/**
* 查询当前页数据和数量
* @param param
* @return
*/
List<FireRectificationBo> queryFiresAndCount(Map<String,Object> param);
long countQueryFireList(Map<String,Object> param);
/**
* 查询详细信息
* @param billNo
* @return
*/
FireRectificationBo selectOneForBase(String billNo);
List<FireMoreDataBo> selectOneForEmergency(String billNo);
List<FireMoreDataBo> selectOneForDanger(String billNo);
List<FireMoreDataBo> selectOneForHidden (String billNo);
FireInfoBo selectOneForfire(String billNo, int id);
/**
* 修改单据及其相关信息
* @param param
* @return
*/
int updateBill(Map<String,String > param);
int updateWarnning(FireMoreDataBo param);
int updateHidden(FireMoreDataBo param);
......
......@@ -30,6 +30,16 @@ public class FireRectificationServiceImpl implements FireRectificationService {
@Value("${file.downLoad.url}")
private String ipUrl;
/**
* 根据条件查询对应单据
* @param nameLike 单据模糊查询
* @param sDate 起始日
* @param eDate 终止日
* @param states 状态
* @param pageNum 页码
* @param pageSize
* @return
*/
@Override
public Map<String, Object> queryFiresAndCount(String nameLike, String sDate, String eDate, int states, int pageNum,int pageSize) {
if(nameLike.trim().equals("")){
......@@ -51,6 +61,11 @@ public class FireRectificationServiceImpl implements FireRectificationService {
return map;
}
/**
* 查询详细单据信息
* @param billNo
* @return
*/
@Override
public Map<String, Object> selectOneById(String billNo) {
Map<String ,Object> result = new HashMap();
......@@ -72,6 +87,11 @@ public class FireRectificationServiceImpl implements FireRectificationService {
return result;
}
/**
* 下载文件
* @param path
* @param response
*/
@Override
public void downLoadFilesByUrll(String path, HttpServletResponse response) {
List<String> list = Arrays.asList(path.split(","));
......@@ -82,6 +102,11 @@ public class FireRectificationServiceImpl implements FireRectificationService {
}
}
/**
* 修改单据相关信息
* @param paramBo
* @return
*/
@Override
public Map<String, String> updateByid(FireParamBo paramBo) {
Map<String, String> map = new HashMap<>();
......@@ -121,6 +146,12 @@ public class FireRectificationServiceImpl implements FireRectificationService {
return map;
}
/**
* 判空
* @param data
* @param list
* @return
*/
public boolean isDataEmpty (String data,List<FireMoreDataBo> list) {
if (data != null){
return !("").equals(data);
......
......@@ -22,9 +22,25 @@ public interface FireRectificationService {
* @return
*/
Map<String, Object> queryFiresAndCount(String nameLike, String sDate, String eDate, int states, int pageNum ,int pageSize);
/**
* 查询详细单据信息
* @param billNo
* @return
*/
Map<String ,Object> selectOneById(String billNo);
/**
* 下载文件
* @param path
* @param response
*/
void downLoadFilesByUrll(String path, HttpServletResponse response );
/**
* 修改单据相关信息
* @param paramBo
* @return
*/
Map<String, String> updateByid(FireParamBo paramBo);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment