月报表周报表新增查询条件

src/main/java/com/chinaitop/depot/business/controller/ReportMonthlyController.java

@@ -12,6 +12,7 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,8 +20,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,17 +47,31 @@ public class ReportMonthlyController {
 	@ApiOperation(value="查询月报表列表", notes = "查询月报表列表，支持分页")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
-			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+			@ApiImplicitParam(name = "reportPeriod", value = "月", paramType = "query"),
+			@ApiImplicitParam(name = "status", value = "状态", paramType = "query"),
+			@ApiImplicitParam(name = "filledTime", value = "填报日期", paramType = "query")
 
 	})
-	public PageInfo<ReportMonthly> getReportMonthlyList(Integer pageNum, Integer pageSize, Integer houseId, Integer type, String searchStartDate, String searchEndDate){
-		ReportMonthlyExample example = new ReportMonthlyExample();
-		//ReportMonthlyExample.Criteria criteria = example.createCriteria();
+	public PageInfo<ReportMonthly> getReportMonthlyList(HttpServletRequest request, Integer pageNum, Integer pageSize, String reportPeriod, String status, String filledTime){
+		ReportMonthly record = new ReportMonthly();
+
+		if (StringUtils.isNotBlank(status)){
+			record.setStatus(status);
+		}
+		if(ParameterUtil.isnotnull(filledTime) ){
+			//Date starDate = ParameterUtil.string2datetime(filledTime + " 00:00:00");
+			record.setFilledTimeCopy(filledTime);
+
+		}
 		if (pageNum!=null && pageSize!=null) {
 			PageHelper.startPage(pageNum, pageSize);
 		}
 
-		List<ReportMonthly> list = reportMonthlyService.queryByExample(example);
+		if (StringUtils.isNotBlank(reportPeriod)){
+			record.setReportPeriod(reportPeriod);
+		}
+		List<ReportMonthly> list = reportMonthlyService.getReportMonthlyList(record);
 		PageInfo<ReportMonthly> pageInfo = new PageInfo<ReportMonthly>(list);
 		return pageInfo;
 	}
@@ -88,9 +105,15 @@ public class ReportMonthlyController {
 		try {
 			ReportMonthly reportMonthly = (ReportMonthly) mapper.readValue(reportMonthlyJson, ReportMonthly.class);
 			reportMonthly.setOrgId(orgId);
+			if(ParameterUtil.isnotnull(reportMonthly.getFilledName()) ){
+				Date starDate = ParameterUtil.string2datetime(reportMonthly.getFilledName() + " 00:00:00");
+				reportMonthly.setFilledTime(starDate);
+
+			}
 			if(ParameterUtil.isnotnull(reportMonthly.getId())){
 				reportMonthlyService.update(reportMonthly);
 			}else{
+				reportMonthly.setStatus("0");
 				reportMonthlyService.add(reportMonthly);
 			}
 		} catch (IOException e) {

src/main/java/com/chinaitop/depot/business/controller/ReportWeeklyController.java

@@ -12,6 +12,7 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,17 +46,31 @@ public class ReportWeeklyController {
 	@ApiOperation(value="查询周报表列表", notes = "查询周报表列表，支持分页")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
-			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+			@ApiImplicitParam(name = "reportPeriod", value = "周", paramType = "query"),
+			@ApiImplicitParam(name = "status", value = "状态", paramType = "query"),
+			@ApiImplicitParam(name = "filledTime", value = "填报日期", paramType = "query")
 
 	})
-	public PageInfo<ReportWeekly> getReportWeeklyList(Integer pageNum, Integer pageSize, Integer houseId, Integer type, String searchStartDate, String searchEndDate){
-		ReportWeeklyExample example = new ReportWeeklyExample();
+	public PageInfo<ReportWeekly> getReportWeeklyList(Integer pageNum, Integer pageSize, String reportPeriod, String status, String filledTime){
+		ReportWeekly example = new ReportWeekly();
 		//ReportWeeklyExample.Criteria criteria = example.createCriteria();
+		if (StringUtils.isNotBlank(reportPeriod)){
+			example.setReportPeriod(reportPeriod);
+		}
+		if (StringUtils.isNotBlank(status)){
+			example.setStatus(status);
+		}
+		if(ParameterUtil.isnotnull(filledTime) ){
+			//Date starDate = ParameterUtil.string2datetime(filledTime + " 00:00:00");
+			example.setFilledTimeCopy(filledTime);
+
+		}
 		if (pageNum!=null && pageSize!=null) {
 			PageHelper.startPage(pageNum, pageSize);
 		}
 
-		List<ReportWeekly> list = reportWeeklyService.queryByExample(example);
+		List<ReportWeekly> list = reportWeeklyService.getReportWeeklyList(example);
 		PageInfo<ReportWeekly> pageInfo = new PageInfo<ReportWeekly>(list);
 		return pageInfo;
 	}
@@ -88,9 +104,15 @@ public class ReportWeeklyController {
 		try {
 			ReportWeekly reportWeekly = (ReportWeekly) mapper.readValue(reportWeeklyJson, ReportWeekly.class);
 			reportWeekly.setOrgId(orgId);
+			if(ParameterUtil.isnotnull(reportWeekly.getFilledName()) ){
+				Date starDate = ParameterUtil.string2datetime(reportWeekly.getFilledName() + " 00:00:00");
+				reportWeekly.setFilledTime(starDate);
+
+			}
 			if(ParameterUtil.isnotnull(reportWeekly.getId())){
 				reportWeeklyService.update(reportWeekly);
 			}else{
+				reportWeekly.setStatus("0");
 				reportWeeklyService.add(reportWeekly);
 			}
 		} catch (IOException e) {

src/main/java/com/chinaitop/depot/business/mapper/ReportMonthlyMapper.java

@@ -28,4 +28,7 @@ public interface ReportMonthlyMapper {
     int updateByPrimaryKeySelective(ReportMonthly record);
 
     int updateByPrimaryKey(ReportMonthly record);
+
+    List<ReportMonthly> getReportMonthlyList(ReportMonthly record);
+    List<ReportMonthly> getReportMonthlyListTwo(ReportMonthly record);
 }

src/main/java/com/chinaitop/depot/business/mapper/ReportMonthlyMapper.xml

@@ -175,13 +175,56 @@
     </if>
     <include refid="Base_Column_List" />
     from report_monthly
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
+    <where>
+      <if test="status != null">
+        and status = #{status,jdbcType=VARCHAR}
+      </if>
+      <if test="filledTimeCopy != null">
+        and filled_time LIKE CONCAT('%', #{filledTimeCopy,jdbcType=VARCHAR}, '%')
+      </if>
+    </where>
     <if test="orderByClause != null" >
       order by ${orderByClause}
     </if>
   </select>
+
+  <select id="getReportMonthlyList" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.ReportMonthly" >
+    select
+    <include refid="Base_Column_List" />
+    from report_monthly
+    <where>
+      <if test="status != null">
+        and status = #{status,jdbcType=VARCHAR}
+      </if>
+      <if test="filledTimeCopy != null">
+        and filled_time LIKE CONCAT('%', #{filledTimeCopy,jdbcType=VARCHAR}, '%')
+      </if>
+      <if test="reportPeriod != null">
+        and SUBSTRING(report_period,6,1)=#{reportPeriod,jdbcType=VARCHAR}
+      </if>
+    </where>
+      order by filled_time
+
+  </select>
+  <select id="getReportMonthlyListTwo" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.ReportMonthly" >
+    select
+    <include refid="Base_Column_List" />
+    from report_monthly
+    <where>
+      <if test="status != null">
+        and status = #{status,jdbcType=VARCHAR}
+      </if>
+      <if test="filledTimeCopy != null">
+        and filled_time LIKE CONCAT('%', #{filledTimeCopy,jdbcType=VARCHAR}, '%')
+      </if>
+      <if test="reportPeriod != null">
+        and SUBSTRING(report_period,6,2)=#{reportPeriod,jdbcType=VARCHAR}
+      </if>
+    </where>
+    order by filled_time
+
+  </select>
+
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
     <include refid="Base_Column_List" />

src/main/java/com/chinaitop/depot/business/mapper/ReportWeeklyMapper.java

@@ -28,4 +28,7 @@ public interface ReportWeeklyMapper {
     int updateByPrimaryKeySelective(ReportWeekly record);
 
     int updateByPrimaryKey(ReportWeekly record);
+
+    List<ReportWeekly> getReportWeeklyList(ReportWeekly example);
+    List<ReportWeekly> getReportWeeklyListTwo(ReportWeekly example);
 }

src/main/java/com/chinaitop/depot/business/mapper/ReportWeeklyMapper.xml

@@ -203,13 +203,56 @@
     </if>
     <include refid="Base_Column_List" />
     from report_weekly
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
+    <where>
+      <if test="status != null">
+        and status = #{status,jdbcType=VARCHAR}
+      </if>
+      <if test="filledTimeCopy != null">
+        and filled_time LIKE CONCAT('%', #{filledTimeCopy,jdbcType=VARCHAR}, '%')
+      </if>
+    </where>
     <if test="orderByClause != null" >
       order by ${orderByClause}
     </if>
   </select>
+
+  <select id="getReportWeeklyList" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.ReportWeekly" >
+    select
+    <include refid="Base_Column_List" />
+    from report_weekly
+    <where>
+      <if test="status != null">
+        and status = #{status,jdbcType=VARCHAR}
+      </if>
+      <if test="filledTimeCopy != null">
+        and filled_time LIKE CONCAT('%', #{filledTimeCopy,jdbcType=VARCHAR}, '%')
+      </if>
+      <if test="reportPeriod != null">
+        and SUBSTRING(report_period,7,1)=#{reportPeriod,jdbcType=VARCHAR}
+      </if>
+
+    </where>
+    order by filled_time
+  </select>
+  <select id="getReportWeeklyListTwo" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.ReportWeekly" >
+    select
+    <include refid="Base_Column_List" />
+    from report_weekly
+    <where>
+      <if test="status != null">
+        and status = #{status,jdbcType=VARCHAR}
+      </if>
+      <if test="filledTimeCopy != null">
+        and filled_time LIKE CONCAT('%', #{filledTimeCopy,jdbcType=VARCHAR}, '%')
+      </if>
+      <if test="reportPeriod != null">
+        and SUBSTRING(report_period,7,2)=#{reportPeriod,jdbcType=VARCHAR}
+      </if>
+
+    </where>
+    order by filled_time
+  </select>
+
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
     <include refid="Base_Column_List" />

src/main/java/com/chinaitop/depot/business/model/ReportMonthly.java

@@ -2,11 +2,13 @@ package com.chinaitop.depot.business.model;
 
 import java.util.Date;
 
-public class ReportMonthly {
+public class ReportMonthly extends ReportMonthlyExample {
     private Integer id;
 
     private String status;
 
+    private String filledTimeCopy;
+
     private String companyOrgCode;
 
     private String reportPeriod;
@@ -1550,4 +1552,14 @@ public class ReportMonthly {
     public void setCountyPlanNumber(String countyPlanNumber) {
         this.countyPlanNumber = countyPlanNumber == null ? null : countyPlanNumber.trim();
     }
+
+
+    public void setFilledTimeCopy(String filledTimeCopy) {
+        this.filledTimeCopy = filledTimeCopy == null ? null : filledTimeCopy.trim();
+    }
+
+    public String getFilledTimeCopy() {
+        return filledTimeCopy;
+    }
+
 }

src/main/java/com/chinaitop/depot/business/model/ReportWeekly.java

@@ -2,11 +2,13 @@ package com.chinaitop.depot.business.model;
 
 import java.util.Date;
 
-public class ReportWeekly {
+public class ReportWeekly extends ReportWeeklyExample {
     private Integer id;
 
     private String status;
 
+    private String filledTimeCopy;
+
     private String companyOrgCode;
 
     private String reportPeriod;
@@ -1928,4 +1930,12 @@ public class ReportWeekly {
     public void setProvinceRemarksOil(String provinceRemarksOil) {
         this.provinceRemarksOil = provinceRemarksOil == null ? null : provinceRemarksOil.trim();
     }
+
+    public String getFilledTimeCopy() {
+        return filledTimeCopy;
+    }
+
+    public void setFilledTimeCopy(String filledTimeCopy) {
+        this.filledTimeCopy = filledTimeCopy;
+    }
 }

src/main/java/com/chinaitop/depot/business/service/ReportMonthlyService.java

@@ -40,4 +40,5 @@ public interface ReportMonthlyService {
 	 */
 	void remove(Integer Id);
 
+    List<ReportMonthly> getReportMonthlyList(ReportMonthly record);
 }

src/main/java/com/chinaitop/depot/business/service/ReportWeeklyService.java

@@ -40,4 +40,6 @@ public interface ReportWeeklyService {
 	void remove(Integer Id);
 
     void updateWeeklyStatus(ReportWeekly week);
+
+    List<ReportWeekly> getReportWeeklyList(ReportWeekly example);
 }

src/main/java/com/chinaitop/depot/business/service/impl/ReportMonthlyServiceImpl.java

@@ -21,6 +21,23 @@ public class ReportMonthlyServiceImpl implements ReportMonthlyService {
 		// TODO Auto-generated method stub
 		return reportMonthlyMapper.selectByExample(example);
 	}
+
+	@Override
+	public List<ReportMonthly> getReportMonthlyList(ReportMonthly record) {
+		if(record.getReportPeriod()!=null){
+			if (Integer.parseInt(record.getReportPeriod())<10) {
+				return reportMonthlyMapper.getReportMonthlyList(record);
+			}else {
+				return reportMonthlyMapper.getReportMonthlyListTwo(record);
+			}
+		}else {
+			return reportMonthlyMapper.selectByExample(record);
+		}
+
+		// TODO Auto-generated method stub
+
+	}
+
 	//根据id修改计划状态
 	@Override
 	public void updateMonthlyStatus(ReportMonthly mon) {

src/main/java/com/chinaitop/depot/business/service/impl/ReportWeeklyServiceImpl.java

@@ -22,6 +22,22 @@ public class ReportWeeklyServiceImpl implements ReportWeeklyService {
 		return reportWeeklyMapper.selectByExample(example);
 	}
 
+
+	@Override
+	public List<ReportWeekly> getReportWeeklyList(ReportWeekly example) {
+		// TODO Auto-generated method stub
+		if (example.getReportPeriod()!=null) {
+			if (Integer.parseInt(example.getReportPeriod())<10) {
+				return reportWeeklyMapper.getReportWeeklyList(example);
+			}else {
+				return reportWeeklyMapper.getReportWeeklyListTwo(example);
+			}
+		}else {
+			return reportWeeklyMapper.selectByExample(example);
+		}
+
+	}
+
 	@Override
 	public ReportWeekly findById(Integer Id) {
 		// TODO Auto-generated method stub