Browse Source

科德系统公出汇总修改

anderx 1 year ago
parent
commit
7b07465bfb

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

@@ -893,7 +893,7 @@
     </select>
     <select id="listPublicDtails" resultType="com.goafanti.weChat.bo.OutPublicDtails">
         select a.id prdId,b.id,a.district_name districtName ,c.name aname,a.duration ,b.status ,b.annex_url annexUrl,a.photo_url photoUrl,d.nickname userName,
-        date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn ,b.remarks ,b.supplement ,b.`type` ,b.object_type objectType ,
+        date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S') clockInTimes,a.clock_in clockIn ,b.remarks ,b.supplement ,b.`type` ,b.object_type objectType ,b.alone,
         date_format(b.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,b.audit_info auditInfo,date_format(b.audit_time ,'%Y-%m-%d %H:%i:%S') auditTimes,
         date_format(b.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(b.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,a.address_name addressName,
         b.plan ,b.next_plan nextPlan ,b.expected_effect expectedEffect,b.update_status updateStatus,b.assist_aid_name assistAidName,

+ 20 - 1
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -36,8 +36,10 @@ public class OutPublicDtails  {
 	private String releaseStarts;
 	@Excel(name = "公出结束时间")
 	private String releaseEnds;
-	@Excel(name = "打卡状态",readConverterExp = "0=未打卡,1=已打卡,2=异常打卡",width = 8)
+
 	private Integer clockIn;
+	@Excel(name = "打卡状态",width = 8)
+	private String clockInStr;
 	@Excel(name = "打卡时间" )
 	private String clockInTimes;
 	@Excel(name = "创建时间" )
@@ -67,12 +69,29 @@ public class OutPublicDtails  {
 	@Excel(name = "协单助手" )
 	private String assistantName;
 	private Integer assist;
+	private Integer alone;
 	private Integer objectType;
 	@Excel(name = "合同编号" )
 	private String contractNo;
 	@Excel(name = "订单总金额" ,scale = 6)
 	private BigDecimal totalAmout;
 
+	public String getClockInStr() {
+		return clockInStr;
+	}
+
+	public void setClockInStr(String clockInStr) {
+		this.clockInStr = clockInStr;
+	}
+
+	public Integer getAlone() {
+		return alone;
+	}
+
+	public void setAlone(Integer alone) {
+		this.alone = alone;
+	}
+
 	public String getAddressName() {
 		return addressName;
 	}

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

@@ -2597,6 +2597,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	private void pushiClockInTime(List<OutPublicDtails> list, List<PublicReleaseClock> publicReleaseClocks) {
 		for (OutPublicDtails outPublicDtails : list) {
+			if (outPublicDtails.getClockIn()!=null){
+				if (outPublicDtails.getAlone()==2&&outPublicDtails.getAssist()==1){
+					outPublicDtails.setClockInStr("无需打卡");
+				}else if (outPublicDtails.getClockIn()==0)outPublicDtails.setClockInStr("未打卡");
+				else if (outPublicDtails.getClockIn()==1)outPublicDtails.setClockInStr("已打卡");
+				else if (outPublicDtails.getClockIn()==2)outPublicDtails.setClockInStr("异常打卡");
+			}
 			List<PublicReleaseClock> colokList =new ArrayList<>();
 			StringBuilder sb = new StringBuilder();
 			for (PublicReleaseClock e : publicReleaseClocks) {