费用科目查询修改

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/todo/ExpenseAccountDO.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
 import io.swagger.annotations.ApiModelProperty;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.List;
 
@@ -131,4 +132,18 @@ public class ExpenseAccountDO extends BaseVOEntity{
 
     @ApiModelProperty(name = "创建订单是否固定显示  0-否 1-是")
     private Integer fixedOrderDisplay;
+
+    @ApiModelProperty(name = "创建者姓名")
+    private String createByName;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新者")
+    private Long updateBy;
+
+    @ApiModelProperty(name = "创建者姓名")
+    private String updateByName;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facade/expenseAccount/ExpenseAccountApi.java

@@ -18,6 +18,7 @@ import com.mhd.common.core.constant.HttpStatus;
 import com.mhd.common.core.domain.entity.R;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +63,12 @@ public class ExpenseAccountApi extends BaseController{
                 logger.info("expenseAccountDTO 为 null，创建新对象");
             }
             ExpenseAccountDO expenseAccountDO = expenseAccountAssembler.toDO(expenseAccountDTO);
+            if(StringUtils.isBlank(expenseAccountDTO.getCreateByName())){
+                expenseAccountDO.setCreateByName(null);
+            }
+            if(StringUtils.isBlank(expenseAccountDTO.getUpdateByName())){
+                expenseAccountDO.setUpdateByName(null);
+            }
             logger.info("转换后的 ExpenseAccountDO：{}", expenseAccountDO);
             startPage();
             logger.info("分页参数已设置");

mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java

@@ -112,7 +112,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
     private String url="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK";
 
     //nc正式环境地址
-    //private String url="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
+    private String zsurl="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
     /**
      * 查询对账单列表
      */
@@ -551,7 +551,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                             reconciliation.setNcId("ys"+String.valueOf(reconciliation.getReconciliationId()));
                             //reconciliationMapper.updateById(reconciliation);
                             CloseableHttpClient httpClient = HttpClients.createDefault();
-                            HttpPost httpPost = new HttpPost(url);
+                            HttpPost httpPost = new HttpPost(zsurl);
                             StringEntity postingString = new StringEntity(xmlString, "UTF-8");
                             httpPost.setEntity(postingString);
                             httpPost.setHeader("Content-type", "application/xml");
@@ -958,7 +958,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                     reconciliation.setSkNcId("sk"+String.valueOf(reconciliation.getReconciliationId()));
                     //reconciliationMapper.updateById(reconciliation);
                     CloseableHttpClient httpClient = HttpClients.createDefault();
-                    HttpPost httpPost = new HttpPost(url);
+                    HttpPost httpPost = new HttpPost(zsurl);
                     StringEntity postingString = new StringEntity(xmlString, "UTF-8");
                     httpPost.setEntity(postingString);
                     httpPost.setHeader("Content-type", "application/xml");