Merge remote-tracking branch 'origin/dev' into dev

topsun-xt/src/main/webapp/biz/topsun/sap/customerDelayPay/customerDelayPayDetail.jsp

@@ -30,7 +30,7 @@
             <x:checkboxListC name="xblock" required="false" label="仅显示扣单应收项次" labelCol="2" fieldCol="2" dictionary="xblock"/>
         </div>
         <div class="hg-form-row">
-            <x:inputC name="payDate" required="false" label="客户承诺付款时间" labelCol="2" fieldCol="2" wrapper="date"/>
+            <x:inputC name="payDate" required="true" label="客户承诺付款时间" labelCol="2" fieldCol="2" wrapper="date"/>
             <div id="button">
                 <x:button value="查 询" icon="fa-search" onclick="doQuery(this.form)"/>&nbsp;&nbsp;
                 <x:button value="重 置" icon="fa-history" onclick="doClear()"/>

topsun-xt/src/main/webapp/biz/topsun/sap/customerDelayPay/customerDelayPayList.js

@@ -24,6 +24,7 @@ function loadGrid() {
             {display: "收款方式", name: "paymentMethodTextView", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "客户承诺付款时间", name: "payDate", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "状态", name: "statusTextView", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "left"},
         ],
         dataAction: "server",
         url: web_app.name + '/customerDelayPay/slicedCustomerDelayPayList.ajax',

topsun/src/main/java/com/huigou/topsun/common/Function.java

@@ -264,4 +264,17 @@ public class Function extends AbstractDaoFunction {
 		String sql = this.getSqlByname("queryStationLeaders");
 		return this.sqlExecutorDao.queryToList(sql, OrgUnit.class, bizId);
 	}
+
+	/**
+	 * 根据业务主表id和业务表名查询对应申请人的直接领导
+	 * @param bizId
+	 * @param tableName
+	 * @return
+	 */
+	public List<OrgUnit> findbmjl(String bizId,String tableName){
+		Assert.hasText(bizId, "参数id不能为空。");
+		String sql = this.getSqlByname("querybmjl");
+		sql = sql.replace("%s",tableName);
+		return this.sqlExecutorDao.queryToList(sql, OrgUnit.class,bizId);
+	}
 }

topsun/src/main/java/com/huigou/topsun/sap/customerDelayPay/application/impl/CustomerDelayPayApplicationImpl.java

@@ -16,6 +16,7 @@ import com.huigou.topsun.sap.customerDelayPay.domain.CustomerDelayPayItem;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bpm.FlowBroker;
 import com.huigou.util.ClassHelper;
+import com.huigou.util.DateUtil;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,7 @@ public class CustomerDelayPayApplicationImpl extends FlowBroker implements Custo
     public Map<String, Object> slicedCustomerDelayPayList(CustomerDelayPayQueryRequest queryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "customerDelayPay");
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+        queryModel.putDictionary("status",BizBillStatus.getMap());
         Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
         return map;
     }
@@ -162,6 +164,8 @@ public class CustomerDelayPayApplicationImpl extends FlowBroker implements Custo
         param.put("BUKRS",customerDelayPay.getBukrs());
         param.put("KUNNR",customerDelayPay.getCustomer());
         param.put("ZBPMNR",customerDelayPay.getBillCode());
+        String payDate = DateUtil.getDateFormat(customerDelayPay.getPayDate(), "yyyyMMdd");
+        param.put("DATUM",payDate);
         List<Map<String,Object>> mapList = new ArrayList<>();
         mapList.add(param);
         ObjectMapper objectMapper = new ObjectMapper();

topsun/src/main/java/com/huigou/topsun/sap/customerDelayPay/domain/CustomerDelayPay.java

@@ -57,7 +57,7 @@ public class CustomerDelayPay extends FlowBillAbstractEntity {
     @Column(name = "TYPE")
     private String type;
 
-    @Column(name = "MESSGAE")
+    @Column(name = "MESSAGE")
     private String message;
     @Override
     protected String getCodeRuleId() {

topsun/src/main/resources/config/topsun/base/function.xml

@@ -234,6 +234,13 @@
 			 )
 			 AND sa.CODE = ?;
 		</sql>
+		<!--根据物料主数据查询创建人的直接上级-->
+		<sql name="querybmjl">
+			SELECT o.FULL_ID, o.FULL_NAME
+			 FROM sa_oporg o WHERE o.PARENT_ID IN (
+			 SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN ( SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) )
+			 AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ' );
+		</sql>
 	</query>
 
 </query-mappings>
\ No newline at end of file