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

+ 20 - 2
.idea/workspace.xml

@@ -9,7 +9,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="1、修改修改客户信息接口&#10;2、开发客户资料列表&#10;3、开发客户资料日志列表" />
+    <list default="true" id="03bdfc55-71bf-4741-8c4c-e1a0c2a3c3ba" name="Default Changelist" comment="updateConfig">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java" afterDir="false" />
+    </list>
     <list id="571ad643-3e7d-4437-aedf-999fc56d0449" name="updateBusinessScope" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -63,6 +67,7 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="ToolWindowEvent Log.ShowToolbar" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -215,6 +220,7 @@
       <workItem from="1630656368650" duration="64000" />
       <workItem from="1630656901862" duration="33000" />
       <workItem from="1630888067668" duration="852000" />
+      <workItem from="1630893291690" duration="5112000" />
     </task>
     <task id="LOCAL-00001" summary="修改客户跟进列表">
       <created>1630486551669</created>
@@ -323,7 +329,19 @@
     <MESSAGE value="idea" />
     <MESSAGE value="1、修改修改客户信息接口" />
     <MESSAGE value="1、修改修改客户信息接口&#10;2、开发客户资料列表&#10;3、开发客户资料日志列表" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、修改修改客户信息接口&#10;2、开发客户资料列表&#10;3、开发客户资料日志列表" />
+    <MESSAGE value="updateConfig" />
+    <option name="LAST_COMMIT_MESSAGE" value="updateConfig" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java</url>
+          <line>1076</line>
+          <option name="timeStamp" value="4" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>

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

@@ -1496,7 +1496,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   <select id="selectDunOrderNewListByPage" resultType="com.goafanti.order.bo.outOrderDunListBo">
     	select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userName,tm.salesman_name as salesmanName,b.project_status projectStatus,
 	b.total_amount as totalAmount,b.liquidation_status as liquidationStatus,b.settlement_amount as settlementAmount,a.money as accountsReceivable,
-	if((b.total_amount-b.settlement_amount) &lt; 1,0,(b.total_amount-b.settlement_amount)) as uncollectedAmount,b.order_status as orderStatus,
+	if((b.total_amount-b.settlement_amount) &lt; 0,0,(b.total_amount-b.settlement_amount)) as uncollectedAmount,b.order_status as orderStatus,
 	date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,date_format(b.sign_time,'%Y-%m-%d') as signDate,
 	<if test="newStatus == 0 ">
 	a.dun_subject as dunSubject,a.dun_status dunStatus

+ 14 - 7
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -984,7 +984,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	/**
 	 *  	将合同编号置为闲置编号
 	 * @param orderNo
-	 * @param t
 	 */
 	private void contractNoReplace(String orderNo, String  contractNo,String orderDep) {
 		Calendar c=Calendar.getInstance();
@@ -1075,13 +1074,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			List<outOrderDunListBo> list=(List<outOrderDunListBo>) dunOrderNewList( name,  orderNo,  starTime,  endTime,
 					 specially,  adminName, depId,newStatus, pageNo,  pageSize).getList();
 			
-    		String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","结算状态","应收款","已收款","未收款","项目状态","催收科目","催款状态","催款启动时间","签单时间"};
+    		String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","应收款","已收款","拨款比例","结算状态","未收款","项目状态","催收科目","催款状态","催款启动时间","签单时间"};
     		String fileName ="催款信息记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		//type 0 变更
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"催款信息");
     		//根据列表编写文档
     		XSSFSheet sheet =wb.getSheetAt(0);
-    		System.out.println(list.get(0).getAccountsReceivable());
     		for (outOrderDunListBo ob : list) {
     			//新增一行
     			XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
@@ -1091,16 +1089,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
     				switch (comment[i]) {
 //    "合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","项目负责人","签单金额","结算状态","已收款","应收款","项目状态","催收科目","催款启动时间"
     				case "合同编号": o = ob.getContractNo(); break;
-    				case "订单编号": o = ob.getOrderNo().toString(); break;
+    				case "订单编号": o = ob.getOrderNo(); break;
     				case "客户名称": o = ob.getUserName(); break;
     				case "订单负责人": o = ob.getSalesmanName(); break;
     				case "订单部门": o = ob.getDepName(); break;
     				case "订单状态": o = OrderNewState.getValueByCode(ob.getOrderStatus());break;
     				case "签单金额": o = ob.getTotalAmount().toString(); break;
+    				case "已收款": o = bigToString(ob.getSettlementAmount()); break;
+    				case "未收款": o = bigToString(ob.getUncollectedAmount()); break;
+    				case "拨款比例": o = bigToString(ob.getAppropriationRatio()); break;
     				case "结算状态": o = LiquidationNewState.getValueByCode(ob.getLiquidationStatus()); break;
-    				case "应收款": o = ob.getAccountsReceivable().toString(); break;
-    				case "已收款": o = ob.getSettlementAmount().toString(); break;
-    				case "未收款": o = ob.getUncollectedAmount().toString(); break;
+    				case "应收款": o = bigToString(ob.getAccountsReceivable()); break;
     				case "项目状态": o = NewProjectStatus.getValueByCode(ob.getProjectStatus()); break;
     				case "催收科目": o = ob.getDunSubject(); break;
     				case "催款状态": o = ob.getDunStatus()==0?"未启动":"已启动"; break;
@@ -1120,6 +1119,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			 out.flush();
 			 out.close();
 		} catch (Exception e) {
+			e.printStackTrace();
 			throw new BusinessException(new Error("表格生成错误。"));
 		}finally {
 			out.flush(); 
@@ -1128,6 +1128,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		
 	}
 
+	private String bigToString (BigDecimal o){
+		if(o==null){return "";}
+		else{
+			return o.stripTrailingZeros().toEngineeringString();
+		}
+	}
+
 
 
 	@Override