Browse Source

提交类型 处理bug
提交内容 针对客户联系人,添加对于明细表附加的支持

Bitliker 7 years ago
parent
commit
1513519de2

+ 7 - 2
app_modular/apputils/src/main/java/com/modular/apputils/presenter/BillPresenter.java

@@ -330,12 +330,12 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
                 break;
             case SAVE_AND_SUBMIT:
                 if (JSONUtil.getBoolean(jsonObject, "success")) {
-                    if (mId<=0){
+                    if (mId <= 0) {
                         int keyvalue = JSONUtil.getInt(jsonObject, "keyvalue");
                         String formcode = JSONUtil.getText(jsonObject, "formcode");
                         judgeApproval(keyvalue, formcode);
                         iBill.showToast(R.string.save_success);
-                    }else{
+                    } else {
                         judgeApproval(mId, "");
                         iBill.showToast(R.string.save_success);
                     }
@@ -591,6 +591,11 @@ public class BillPresenter extends BaseNetPresenter implements OnSmartHttpListen
         }
         if ((type.equals("D") || type.equals("T")) && TextUtils.isEmpty(defValue)) {
             defValue = DateFormatUtil.long2Str(System.currentTimeMillis() + 1000 * 10 * 60, DateFormatUtil.YMD_HMS);
+            if (caption.contains("生日")) {
+                String day = DateFormatUtil.long2Str(System.currentTimeMillis(), DateFormatUtil.YMD);
+                mBillModel.setValue(day);
+                mBillModel.setDisplay(defValue);
+            }
         }
         mBillModel.setFindFunctionName(findFunctionName);
         mBillModel.setCaption(caption);

+ 6 - 1
app_modular/appworks/src/main/java/com/uas/appworks/adapter/CustomerCareListAdapter.java

@@ -49,7 +49,12 @@ public class CustomerCareListAdapter extends EasyBaseAdapter {
                 StringBuilder subTitleBuilder=new StringBuilder(DateFormatUtil.long2Str(time,DateFormatUtil.MD));
                 subTitleBuilder.append(" | 农历  "+new Lunar(new Date(time)).toString());
                 mViewHolder.subTitleTv.setText(subTitleBuilder.toString());
-                mViewHolder.tagTv.setText(String.valueOf(DateFormatUtil.differentDays(time,System.currentTimeMillis()))+"天");
+                String tag="今";
+                int day=DateFormatUtil.differentDays(System.currentTimeMillis(),time);
+                if (day!=0){
+                    tag=String.valueOf(day)+"天";
+                }
+                mViewHolder.tagTv.setText(tag);
             }
             view.setTag(mViewHolder);
         } else {