anderx лет назад: 4
Родитель
Сommit
76824d3421

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1135,7 +1135,7 @@ select a.id,a.nickname as name,a.source,c.name contacts,c.mobile as contactMobil
     and  a.share_type = 0 
     </if>
      <if test="type==1 or type==2 ">
-    and  a.share_type in (0,2)
+    and  a.share_type in (0,2) and a.channel=0
     </if>
     <if test="type == 5">
     and  a.share_type = 2

+ 7 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -600,7 +600,7 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
   
   <select id="listPublicDtails" resultType="com.goafanti.weChat.bo.OutPublicDtails">
   	select b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
-		date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,
+		date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn,
 	date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds
 	from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
 	where 1=1
@@ -616,6 +616,9 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 	<if test="status != null">
 	and a.status = #{status}
 	</if>
+	<if test="clockIn !=null">
+	and a.clock_in= #{clockIn}
+	</if>
 	<if test="page_sql!=null">
 			${page_sql}
 	</if>
@@ -637,6 +640,9 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 	<if test="status != null">
 	and a.status = #{status}
 	</if>
+	<if test="clockIn !=null">
+	and a.clock_in= #{clockIn}
+	</if>
   </select>
   
   <select id="checkTime" resultType="java.lang.Integer">

+ 1 - 0
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -320,6 +320,7 @@ public class NewExcelUtil<T> {
 	private Map<String, CellStyle> createStyles(Workbook wb) {
 		// 写入各条记录,每条记录对应excel表中的一行
 		Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+		//
 		CellStyle style = wb.createCellStyle();
 		style.setAlignment(HorizontalAlignment.CENTER);
 		style.setVerticalAlignment(VerticalAlignment.CENTER);

+ 7 - 0
src/main/java/com/goafanti/weChat/bo/InputPublicDtails.java

@@ -7,6 +7,7 @@ public class InputPublicDtails {
 	private String aid;
 	private String uid;
 	private Integer status;
+	private Integer clockIn;
 	private Integer pageSize;
 	private Integer pageNo;
 	
@@ -55,6 +56,12 @@ public class InputPublicDtails {
 	public void setReleaseEnd(String releaseEnd) {
 		this.releaseEnd = releaseEnd;
 	}
+	public Integer getClockIn() {
+		return clockIn;
+	}
+	public void setClockIn(Integer clockIn) {
+		this.clockIn = clockIn;
+	}
 	
 	
 }

+ 8 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -17,6 +17,8 @@ public class OutPublicDtails {
 	private String releaseStarts;
 	@Excel(name = "公出结束时间")
 	private String releaseEnds;
+	@Excel(name = "打卡状态",readConverterExp = "0=未打卡,1=已打卡")
+	private Integer clockIn;
 	@Excel(name = "打卡时间" )
 	private String clockInTimes;
 	private String annexUrl;
@@ -83,5 +85,11 @@ public class OutPublicDtails {
 	public void setPhotoUrl(String photoUrl) {
 		this.photoUrl = photoUrl;
 	}
+	public Integer getClockIn() {
+		return clockIn;
+	}
+	public void setClockIn(Integer clockIn) {
+		this.clockIn = clockIn;
+	}
 
 }

+ 1 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -327,6 +327,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if(in.getReleaseEnd()!=null)map.put("releaseEnd", in.getReleaseEnd()+" 23:59:59");
 		if(in.getUid()!=null)map.put("uid", in.getUid());
 		if(in.getStatus()!=null)map.put("status", in.getStatus());
+		if(in.getClockIn()!=null)map.put("clockIn", in.getClockIn());
 		return (Pagination<OutPublicDtails>) findPage("listPublicDtails", "countPublicDtails", map, in.getPageNo(), in.getPageSize());
 	}
 	

+ 8 - 8
src/main/resources/props/config_local.properties

@@ -2,13 +2,13 @@ dev.name=local
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-•#
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+•#
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570
@@ -65,12 +65,12 @@ user_remind_days=15
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//172.16.0.253/1.1.74
+#static.host=//172.16.0.253/1.1.78
 #avatar.host=//172.16.0.253
 
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.77
+static.host=//static.jishutao.com/1.1.78
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -60,7 +60,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.77
+static.host=//static.jishutao.com/1.1.78
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload