统计报表增加统计字段

培训信息增加二维码图片和联系方式

common/src/main/java/com/jpsoft/employment/modules/base/dao/JobInformationInfoDAO.java

@@ -16,6 +16,7 @@ public interface JobInformationInfoDAO {
 	JobInformationInfo get(String id);
 	int delete(String id);
 	List<JobInformationInfo> list();
+	Integer countList(Map<String, Object> searchParams);
 	List<JobInformationInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
 	List<JobInformationInfo> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
 

common/src/main/java/com/jpsoft/employment/modules/base/entity/NewsInfo.java

@@ -57,7 +57,7 @@ public class NewsInfo {
 	@ApiModelProperty(value = "审核状态")
 	private String status;
 
-	@ApiModelProperty(value = "审核状态")
+	@ApiModelProperty(value = "二维码图片")
 	private String codeImage;
 
 

common/src/main/java/com/jpsoft/employment/modules/base/entity/TrainingInfo.java

@@ -62,6 +62,11 @@ public class TrainingInfo {
 	@ApiModelProperty(value = "缩略图")
 	private String thumbnailImage;
 
+	@ApiModelProperty(value = "二维码图片")
+	private String codeImage;
+
+	@ApiModelProperty(value = "咨询电话")
+	private String phone;
 
 	@ApiModelProperty(value = "结束报名时间")
 	@DateTimeFormat(pattern="yyyy-MM-dd")

common/src/main/java/com/jpsoft/employment/modules/base/service/JobInformationInfoService.java

@@ -13,6 +13,7 @@ public interface JobInformationInfoService {
 	int update(JobInformationInfo model);
 	int delete(String id);
 	List<JobInformationInfo> list();
+	Integer countList(Map<String, Object> searchParams);
 	Page<JobInformationInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	Page<JobInformationInfo> pageSearchMobile(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	JobInformationInfo findByPersonId(String personId);

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/JobInformationInfoServiceImpl.java

@@ -58,6 +58,11 @@ public class JobInformationInfoServiceImpl implements JobInformationInfoService
 		// TODO Auto-generated method stub
 		return jobInformationInfoDAO.list();
 	}
+
+	@Override
+	public Integer countList(Map<String, Object> searchParams){
+		return jobInformationInfoDAO.countList(searchParams);
+	}
 		
 	@Override
 	public Page<JobInformationInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {

common/src/main/resources/mapper/base/JobInformationInfo.xml

@@ -128,6 +128,21 @@
 	<select id="list" resultMap="JobInformationInfoMap">
 		select * from base_job_information_info
 	</select>
+	<select id="countList" parameterType="hashmap" resultMap="JobInformationInfoMap">
+		select count(*) from base_job_information_info
+		<where>
+			<if test="searchParams.startTime!= null">
+				<![CDATA[
+					and create_time >= #{searchParams.startTime}
+				]]>
+			</if>
+			<if test="searchParams.endTime!= null">
+				<![CDATA[
+					and create_time <= #{searchParams.endTime}
+				]]>
+			</if>
+		</where>
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="JobInformationInfoMap">
 		<![CDATA[
 			select * from base_job_information_info a left join base_person_info b

common/src/main/resources/mapper/base/TrainingInfo.xml

@@ -18,8 +18,8 @@
 			<result property="status" column="status_" />
 			<result property="thumbnailImage" column="thumbnail_image" />
 			<result property="endTime" column="end_time" />
-
-
+			<result property="codeImage" column="code_image" />
+			<result property="phone" column="phone_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.TrainingInfo">
 	<!--
@@ -29,7 +29,9 @@
 	-->
 	<![CDATA[
 		insert into base_training_info
-	    (id_,name_,title_,content_,file_,create_by,create_time,update_by,update_time,del_flag,enterprise_id,status_,thumbnail_image,end_time)
+	    (id_,name_,title_,content_,file_,create_by,create_time,
+	    update_by,update_time,del_flag,enterprise_id,status_,
+	    thumbnail_image,end_time,code_image,phone_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -46,6 +48,8 @@
 ,#{status,jdbcType=VARCHAR}
 ,#{thumbnailImage,jdbcType=VARCHAR}
 ,#{endTime,jdbcType= TIMESTAMP }
+,#{codeImage,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -94,6 +98,12 @@
 			<if test="endTime!=null">
 				end_time=#{endTime,jdbcType= TIMESTAMP },
 			</if>
+			<if test="codeImage!=null">
+				code_image=#{codeImage,jdbcType=VARCHAR},
+			</if>
+			<if test="phone!=null">
+				phone_=#{phone,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

web/src/main/java/com/jpsoft/employment/modules/base/controller/ReportController.java

@@ -55,6 +55,9 @@ public class ReportController {
     @Autowired
     private RecruitInformationInfoService recruitInformationInfoService;
 
+    @Autowired
+    private JobInformationInfoService jobInformationInfoService;
+
     @Autowired
     private OSSConfig ossConfig;
 
@@ -96,12 +99,18 @@ public class ReportController {
             //今日注册人数
             Integer dailyPersonRegNum = personInfoService.dailyPersonReg(searchParams);
 
-            //求职登记人数，新增人数
+            //累计注册人数
+            Integer totalPersonRegNum = personInfoService.dailyPersonReg(searchParams1);
+
+            //认证人数，新增人数
             Integer personNum = personInfoService.dailyReportList(searchParams);
 
-            //求职登记人数，累计人数
+            //认证人数，累计人数
             Integer totalPersonNum = personInfoService.dailyReportList(searchParams1);
 
+            //简历数 累计简历数
+            Integer totalJobInformation = jobInformationInfoService.countList(searchParams1);
+
             //认证企业数，新增数
             Integer enterpriseNum = enterpriseInfoService.dailyReportList(searchParams);
 
@@ -114,6 +123,9 @@ public class ReportController {
             //岗位需求人数
             Integer jobRequirementNum = recruitInformationInfoService.sumJobRequirementNum(searchParams1);
 
+            //累计岗位需求人数
+            Integer totalJobRequirementNum = recruitInformationInfoService.sumJobRequirementNum(searchParams1);
+
             //新增岗位数量
             searchParams.put("status", "1");
             searchParams.put("isOnline", true);
@@ -143,7 +155,10 @@ public class ReportController {
             map.put("personNum", personNum);
             map.put("totalPersonNum", totalPersonNum);
 
+            map.put("totalJobInformation", totalJobInformation);
+
             map.put("dailyPersonRegNum", dailyPersonRegNum);
+            map.put("totalPersonRegNum", totalPersonRegNum);
 
             map.put("enterpriseNum", enterpriseNum);
             map.put("totalEnterpriseNum", totalEnterpriseNum);