hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、删除没用的字段 

2、单据日期格式处理
3、日志记录删除国子系统
This commit is contained in:
xiang2lin 2025-03-19 08:55:36 +08:00
parent 584d9fceb2
commit fd9f26d3c6
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/entity/OerDjmlEntity.xml
View File

@ -130,9 +130,9 @@ GSDM,KJND,mlId
<if test="jjmc != null and jjmc !='' "> jjmc, </if> <if test="jjmc != null and jjmc !='' "> jjmc, </if>
<if test="khyh != null and khyh !='' "> khyh, </if> <if test="khyh != null and khyh !='' "> khyh, </if>
<if test="yhzh != null and yhzh !='' "> yhzh, </if> <if test="yhzh != null and yhzh !='' "> yhzh, </if>
<if test="ssr != null and ssr !='' "> ssr, </if> <!-- <if test="ssr != null and ssr !='' "> ssr, </if>-->
<if test="ssrid != null and ssrid !='' "> ssrid, </if> <!-- <if test="ssrid != null and ssrid !='' "> ssrid, </if>-->
<if test="ssrq != null and ssrq !='' "> ssrq, </if> <!-- <if test="ssrq != null and ssrq !='' "> ssrq, </if>-->
<if test="jflxdm != null and jflxdm !='' "> jflxdm, </if> <if test="jflxdm != null and jflxdm !='' "> jflxdm, </if>
<if test="jflxmc != null and jflxmc !='' "> jflxmc, </if> <if test="jflxmc != null and jflxmc !='' "> jflxmc, </if>
<if test="xmdm != null and xmdm !='' "> xmdm, </if> <if test="xmdm != null and xmdm !='' "> xmdm, </if>
@ -177,9 +177,9 @@ GSDM,KJND,mlId
<if test="jjmc != null and jjmc !='' "> #{jjmc}, </if> <if test="jjmc != null and jjmc !='' "> #{jjmc}, </if>
<if test="khyh != null and khyh !='' "> #{khyh}, </if> <if test="khyh != null and khyh !='' "> #{khyh}, </if>
<if test="yhzh != null and yhzh !='' "> #{yhzh}, </if> <if test="yhzh != null and yhzh !='' "> #{yhzh}, </if>
<if test="ssr != null and ssr !='' "> #{ssr}, </if> <!-- <if test="ssr != null and ssr !='' "> #{ssr}, </if>-->
<if test="ssrid != null and ssrid !='' "> #{ssrid}, </if> <!-- <if test="ssrid != null and ssrid !='' "> #{ssrid}, </if>-->
<if test="ssrq != null and ssrq !='' "> #{ssrq}, </if> <!-- <if test="ssrq != null and ssrq !='' "> #{ssrq}, </if>-->
<if test="jflxdm != null and jflxdm !='' "> #{jflxdm}, </if> <if test="jflxdm != null and jflxdm !='' "> #{jflxdm}, </if>
<if test="jflxmc != null and jflxmc !='' "> #{jflxmc}, </if> <if test="jflxmc != null and jflxmc !='' "> #{jflxmc}, </if>
<if test="xmdm != null and xmdm !='' "> #{xmdm}, </if> <if test="xmdm != null and xmdm !='' "> #{xmdm}, </if>

25
fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlExtServiceImpl.java
View File

@ -33,10 +33,7 @@ import org.springframework.stereotype.Service;
import java.io.*; import java.io.*;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
@ -517,13 +514,19 @@ public class OerDjmlExtServiceImpl implements IOerDjmlExtService {
* @return * @return
*/ */
private String timestampConvert(String timestamp,String format){ private String timestampConvert(String timestamp,String format){
if (StrUtil.isNotEmpty(timestamp) && NumberUtil.isNumber(timestamp)){ if (StrUtil.isNotEmpty(timestamp)){
try { if (NumberUtil.isNumber(timestamp)){
DateTime date = DateUtil.date(Long.valueOf(timestamp)); try {
String formattedDate = DateUtil.format(date, "yyyyMMdd"); DateTime date = DateUtil.date(Long.valueOf(timestamp));
return formattedDate; String formattedDate = DateUtil.format(date, format);
}catch (Exception e){ return formattedDate;
logger.error("日期转换出错:{}",e); }catch (Exception e){
logger.error("日期转换出错:{}",e);
}
}else if (timestamp.contains("-")){
Date date = DateUtil.parse(timestamp);
String formatDate = DateUtil.format(date, format);
return formatDate;
} }
} }
return timestamp; return timestamp;

8
fw-grpU8/src/main/java/com/hzya/frame/grpU8/nxproof/oerdjml/service/impl/OerDjmlServiceImpl.java
View File

@ -243,8 +243,8 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
pubAuditLogEntity.setAuditorId("1"); pubAuditLogEntity.setAuditorId("1");
pubAuditLogEntity.setAuditor("系统管理员"); pubAuditLogEntity.setAuditor("系统管理员");
pubAuditLogEntity.setAmt(jsonObject.getString("je")); pubAuditLogEntity.setAmt(jsonObject.getString("je"));
pubAuditLogEntity.setRemark("国子系统送审成功"); pubAuditLogEntity.setRemark("送审成功");
pubAuditLogEntity.setAtype("国子系统通过"); pubAuditLogEntity.setAtype("通过");
pubAuditLogEntity.setBillId(maxMlId); pubAuditLogEntity.setBillId(maxMlId);
pubAuditLogEntity.setModname("OER"); pubAuditLogEntity.setModname("OER");
pubAuditLogEntity.setFlowcode("000006"); pubAuditLogEntity.setFlowcode("000006");
@ -306,8 +306,8 @@ public class OerDjmlServiceImpl implements IOerDjmlService {
pubAuditLogEntity.setAuditorId("1"); pubAuditLogEntity.setAuditorId("1");
pubAuditLogEntity.setAuditor("系统管理员"); pubAuditLogEntity.setAuditor("系统管理员");
pubAuditLogEntity.setAmt(entity.getJe()); pubAuditLogEntity.setAmt(entity.getJe());
pubAuditLogEntity.setRemark("国子系统送审成功"); pubAuditLogEntity.setRemark("送审成功");
pubAuditLogEntity.setAtype("国子系统通过"); pubAuditLogEntity.setAtype("通过");
pubAuditLogEntity.setBillId(maxMlId); pubAuditLogEntity.setBillId(maxMlId);
pubAuditLogEntity.setModname("OER"); pubAuditLogEntity.setModname("OER");
pubAuditLogEntity.setFlowcode(entity.getFlowcode()); pubAuditLogEntity.setFlowcode(entity.getFlowcode());