Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintDetectInfo.java

@@ -119,7 +119,7 @@ public class ComplaintDetectInfo implements Serializable {
     private Date scrapCompletionTime;//报废完成时间
 
     private Integer state;//查询各状态条数
-    private Integer detectIsWhetherLess;//是否少件 1是 2否
+    private Integer signclosedIsWhetherLess;//是否少件 1是 2否
 
 
     public Integer getDetectId() {
@@ -738,11 +738,11 @@ public class ComplaintDetectInfo implements Serializable {
         this.state = state;
     }
 
-    public Integer getDetectIsWhetherLess() {
-        return detectIsWhetherLess;
+    public Integer getSignclosedIsWhetherLess() {
+        return signclosedIsWhetherLess;
     }
 
-    public void setDetectIsWhetherLess(Integer detectIsWhetherLess) {
-        this.detectIsWhetherLess = detectIsWhetherLess;
+    public void setSignclosedIsWhetherLess(Integer signclosedIsWhetherLess) {
+        this.signclosedIsWhetherLess = signclosedIsWhetherLess;
     }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintSignclosedInfo.java

@@ -46,6 +46,7 @@ public class ComplaintSignclosedInfo implements Serializable {
     private Integer sendbackId;//客诉寄回id
     private String signclosedLogisticsName;//物流公司名称
     private String date;//日期查询
+    private Integer signclosedIsWhetherLess;//是否少件 1是2否
 
     private Integer adminId;//登录人id
 
@@ -280,4 +281,12 @@ public class ComplaintSignclosedInfo implements Serializable {
     public void setDate(String date) {
         this.date = date;
     }
+
+    public Integer getSignclosedIsWhetherLess() {
+        return signclosedIsWhetherLess;
+    }
+
+    public void setSignclosedIsWhetherLess(Integer signclosedIsWhetherLess) {
+        this.signclosedIsWhetherLess = signclosedIsWhetherLess;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -168,7 +168,8 @@
     cd.scrap_completion_time scrapCompletionTime,
     qd.describe_content describeContent,
     qd.describe_handle_desc describeHandleDesc,
-    sa.admin_name adminName
+    sa.admin_name adminName,
+    cs.signclosed_is_whetherLess signclosedIsWhetherLess
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedInfoMapper.xml

@@ -23,7 +23,7 @@
     signclosed_id, signclosed_logistics,
     signclosed_logistics_number, signclosed_send_name, signclosed_send_tel, signclosed_addr_provinces, 
     signclosed_addr_city,signclosed_addr_area, signclosed_date,signclosed_customer_id,signclosed_desc,
-    signclosed_create_time, signclosed_update_time,signclosed_customer_desc,sendback_id
+    signclosed_create_time, signclosed_update_time,signclosed_customer_desc,sendback_id,signclosed_is_whetherLess
   </sql>
   <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -59,6 +59,7 @@
     <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
     <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
     <result column="sendback_id" property="sendbackId" jdbcType="INTEGER" />
+    <result column="signclosed_is_whetherLess" property="signclosedIsWhetherLess" jdbcType="INTEGER" />
     <collection property="signclosedProductInfoList" column="signclosed_id" ofType="SignclosedProductInfo" select="listSignclosedById"/>
     <collection property="signclosedImgInfoList" column="signclosed_id" ofType="ComplaintSignclosedImg" select="listSignclosedImgById"/>
   </resultMap>
@@ -129,6 +130,7 @@
     cs.signclosed_customer_desc,
     cs.signclosed_is_receiving,
     cs.sendback_id,
+    cs.signclosed_is_whetherLess,
     ap.province signclosedAddrProvincesName,
     ac.city signclosedAddrCityName,
     ad.district signclosedAddrAreaName,
@@ -174,7 +176,7 @@
       signclosed_send_name, signclosed_send_tel, 
       signclosed_addr_provinces, signclosed_addr_city, signclosed_addr_area, signclosed_date,
       signclosed_customer_id,
-      signclosed_desc,signclosed_customer_desc,signclosed_is_receiving,signclosed_company_id,sendback_id
+      signclosed_desc,signclosed_customer_desc,signclosed_is_receiving,signclosed_company_id,sendback_id,signclosed_is_whetherLess
       )
     values (
       #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR},
@@ -186,7 +188,8 @@
       #{signclosedCustomerDesc,jdbcType=VARCHAR},
       #{signclosedIsReceiving,jdbcType=VARCHAR},
       #{signclosedCompanyId,jdbcType=VARCHAR},
-      #{sendbackId,jdbcType=INTEGER}
+      #{sendbackId,jdbcType=INTEGER},
+      #{signclosedIsWhetherLess,jdbcType=INTEGER}
       )
   </insert>
   <update id="updateSignclosedById" parameterType="ComplaintSignclosedInfo" >
@@ -235,7 +238,10 @@
         signclosed_is_receiving = #{signclosedIsReceiving,jdbcType=INTEGER},
       </if>
       <if test="sendbackId != null" >
-        sendback_id = #{sendbackId,jdbcType=INTEGER}
+        sendback_id = #{sendbackId,jdbcType=INTEGER},
+      </if>
+      <if test="signclosedIsWhetherLess != null" >
+        signclosed_is_whetherLess = #{signclosedIsWhetherLess,jdbcType=INTEGER}
       </if>
     </set>
       where

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminDetectController.java

@@ -811,7 +811,7 @@ public class AdminDetectController {
             return;
         }
         String[] cells = {
-                "维修编号","产品名称","颜色","生产月份","机身条码",
+                "维修编号","产品名称","颜色","生产月份","机身条码","是否少件",
                 "退货地区","返厂日期","购买日期","客诉日期","客诉类型",
                 "客诉问题","售后原因","售后处理类型","工厂检测现象","是否翻新机",
                 "故障原因","判断结果","故障指向","原因分析",
@@ -878,12 +878,20 @@ public class AdminDetectController {
                     case 2:detectFloatType = "短";break;
                 }
             }
+            String signclosedIsWhetherLess = "";
+            if(detect.getSignclosedIsWhetherLess() != null){
+                switch (detect.getSignclosedIsWhetherLess()) {
+                    case 1:signclosedIsWhetherLess = "是";break;
+                    case 2:signclosedIsWhetherLess = "否";break;
+                }
+            }
             // 创建单元格，设置值
             row.createCell(0).setCellValue(detect.getDetectNumber()==null?"":detect.getDetectNumber());
             row.createCell(1).setCellValue(detect.getProductName()==null?"":detect.getProductName());
             row.createCell(2).setCellValue(detect.getColorName()==null?"":detect.getColorName());
             row.createCell(3).setCellValue(detect.getDetectProduction()==null?"":detect.getDetectProduction());
             row.createCell(4).setCellValue(detect.getDetectFuselageBarcode()==null?"":detect.getDetectFuselageBarcode());
+            row.createCell(5).setCellValue(signclosedIsWhetherLess);
             StringBuffer area = new StringBuffer(" ");
             if(detect.getSignclosedAddrProvincesName() == null || detect.getSignclosedAddrProvincesName().equals("")){
                 area.append("");
@@ -900,26 +908,27 @@ public class AdminDetectController {
             }else{
                 area.append("-"+detect.getSignclosedAddrCityName());
             }
-            row.createCell(5).setCellValue(area.toString());
+            row.createCell(6).setCellValue(area.toString());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             if(detect.getSignclosedDate()==null){
-                row.createCell(6).setCellValue( "");
+                row.createCell(7).setCellValue( "");
             }else{
-                row.createCell(6).setCellValue(sdf.format(detect.getSignclosedDate()));
+                row.createCell(7).setCellValue(sdf.format(detect.getSignclosedDate()));
             }
             if(detect.getSalesTime()==null){
-                row.createCell(7).setCellValue("");
+                row.createCell(8).setCellValue("");
             }else{
-                row.createCell(7).setCellValue(sdf.format(detect.getSalesTime()));
+                row.createCell(8).setCellValue(sdf.format(detect.getSalesTime()));
             }
             if(detect.getCustomerCreateTime()==null){
-                row.createCell(8).setCellValue("");
+                row.createCell(9).setCellValue("");
             }else{
-                row.createCell(8).setCellValue(sdf.format(detect.getCustomerCreateTime()));
+                row.createCell(9).setCellValue(sdf.format(detect.getCustomerCreateTime()));
             }
 
-            row.createCell(9).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());
-            row.createCell(10).setCellValue(detect.getQuestionTitle()==null?"":detect.getQuestionTitle());
+            row.createCell(10).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());
+            row.createCell(11).setCellValue(detect.getQuestionTitle()==null?"":detect.getQuestionTitle());
+            row.createCell(11).setCellValue(detect.getDescribeHandleDesc()==null?"":detect.getDescribeHandleDesc());
             row.createCell(12).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
             row.createCell(13).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
             row.createCell(14).setCellValue(detectIsRefurbishing);
@@ -1008,7 +1017,7 @@ public class AdminDetectController {
             return;
         }*/
         String[] cells = {
-                "维修编号","快递单号","产品简称","产品颜色","生产月份","机身条码",
+                "维修编号","快递单号","产品简称","产品颜色","生产月份","机身条码","是否少件",
                 "退货地区","返厂日期","售后处理类型","工厂检测现象","是否翻新机","厚膜类型","浮子类型","版本号","检测日期"
         };
         exportExcel2(request,res,cells,detectList);
@@ -1071,6 +1080,13 @@ public class AdminDetectController {
                     case 2:detectFloatType = "短";break;
                 }
             }
+            String signclosedIsWhetherLess = "";
+            if(detect.getSignclosedIsWhetherLess() != null){
+                switch (detect.getSignclosedIsWhetherLess()) {
+                    case 1:signclosedIsWhetherLess = "是";break;
+                    case 2:signclosedIsWhetherLess = "否";break;
+                }
+            }
             // 创建单元格，设置值
             row.createCell(0).setCellValue(detect.getDetectNumber()==null?"":detect.getDetectNumber());
             row.createCell(1).setCellValue(detect.getLogisticsNumber()==null?"":detect.getLogisticsNumber());
@@ -1078,6 +1094,7 @@ public class AdminDetectController {
             row.createCell(3).setCellValue(detect.getColorName()==null?"":detect.getColorName());
             row.createCell(4).setCellValue(detect.getDetectProduction()==null?"":detect.getDetectProduction());
             row.createCell(5).setCellValue(detect.getDetectFuselageBarcode()==null?"":detect.getDetectFuselageBarcode());
+            row.createCell(6).setCellValue(signclosedIsWhetherLess);
             StringBuffer area = new StringBuffer(" ");
             if(detect.getSignclosedAddrProvincesName() == null || detect.getSignclosedAddrProvincesName().equals("")){
                 area.append("");
@@ -1089,24 +1106,24 @@ public class AdminDetectController {
             }else{
                 area.append("-"+detect.getSignclosedAddrCityName());
             }
-            row.createCell(6).setCellValue(area.toString());
+            row.createCell(7).setCellValue(area.toString());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             if(detect.getSignclosedDate()==null){
-                row.createCell(7).setCellValue( "");
+                row.createCell(8).setCellValue( "");
             }else{
-                row.createCell(7).setCellValue(sdf.format(detect.getSignclosedDate()));
+                row.createCell(8).setCellValue(sdf.format(detect.getSignclosedDate()));
             }
             /*row.createCell(9).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());*/
-            row.createCell(8).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
-            row.createCell(9).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
-            row.createCell(10).setCellValue(detectIsRefurbishing);
-            row.createCell(11).setCellValue(detectFilmType);
-            row.createCell(12).setCellValue(detectFloatType);
-            row.createCell(13).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
+            row.createCell(9).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
+            row.createCell(10).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
+            row.createCell(11).setCellValue(detectIsRefurbishing);
+            row.createCell(12).setCellValue(detectFilmType);
+            row.createCell(13).setCellValue(detectFloatType);
+            row.createCell(14).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
             if(detect.getDetectPrintTime()==null){
-                row.createCell(14).setCellValue( "");
+                row.createCell(15).setCellValue( "");
             }else{
-                row.createCell(14).setCellValue(sdf.format(detect.getDetectPrintTime()));
+                row.createCell(15).setCellValue(sdf.format(detect.getDetectPrintTime()));
             }
         }
         //下载导出订单Excel

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl

@@ -218,6 +218,19 @@
             </div>
 
             <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否少件：</label>
+                <div class="formControls col-7 col-sm-7">
+                    <div class="radio-box">
+                        <input type="radio" value="2"  checked="checked" name="signclosedIsWhetherLess">
+                        <label for="tel-1">不少件</label>
+                    </div>
+                       <div class="radio-box">
+                                <input type="radio" value="1"  name="signclosedIsWhetherLess">
+                                <label for="tel-1">少件</label>
+                       </div>
+                </div>
+            </div>
+            <div class="row cl">
                 <label class="form-label col-xs-3 col-sm-3">签收图片：</label>
                 <div class="formControls col-xs-2 col-sm-2" id="fileDiv" style="width: 17%;width: 100px;height: 100px;">
                     <input type="file" name="file" id="fileid" style="opacity: 0; position: absolute; width: 90px;height: 80px;">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl

@@ -167,7 +167,19 @@
                 <input type="hidden" name="signclosedAddrCity" id="signclosedAddrCity" >
                 <input type="hidden" name="signclosedAddrArea" id="signclosedAddrArea" >
             </div>
-
+            <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否少件：</label>
+                <div class="formControls col-7 col-sm-7">
+                    <div class="radio-box">
+                        <input type="radio" value="2"<#if complaintSignclosedInfo.signclosedIsWhetherLess??> <#if complaintSignclosedInfo.signclosedIsWhetherLess == 2>checked="checked" </#if><#else>checked="checked" </#if> name="signclosedIsWhetherLess">
+                        <label for="tel-1">不少件</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" value="1" <#if complaintSignclosedInfo.signclosedIsWhetherLess??> <#if complaintSignclosedInfo.signclosedIsWhetherLess == 1>checked="checked" </#if></#if> name="signclosedIsWhetherLess">
+                        <label for="tel-1">少件</label>
+                    </div>
+                </div>
+            </div>
             <div class="row cl">
                 <label class="form-label col-xs-3 col-sm-3">签收图片：</label>
                 <div class="formControls col-xs-2 col-sm-2" id="fileDiv" style="width: 17%;width: 100px;height: 100px;">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -78,6 +78,7 @@
                 <th width="100">寄件人姓名</th>
                 <th width="100">寄件人电话</th>
                 <th width="250">签收产品</th>
+                <th width="50">是否少件</th>
                 <th width="130">退货地区</th>
 
                 <#--<th width="150">客服备注</th>-->
@@ -130,6 +131,15 @@
                         </#if>
                         </div>
                     </td>
+                    <td class="text-c" width="100">
+                        <#if signclosed.signclosedIsWhetherLess??>
+                            <#if signclosed.signclosedIsWhetherLess == 1>
+                                <span class="c-red">是</span>
+                            <#elseif signclosed.signclosedIsWhetherLess == 2>
+                                <span class="c-success">否</span>
+                            </#if>
+                        </#if>
+                    </td>
                     <td class="text-c" width="100">${signclosed.signclosedAddrProvincesName!}-${signclosed.signclosedAddrCityName!}-${signclosed.signclosedAddrAreaName!}</td>
                     <#--<td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>-->
                     <td class="text-c" width="100">${(signclosed.signclosedDate?string("yyyy-MM-dd"))!''}</td>