2020年11月2日 17:10:24

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml

@@ -180,7 +180,7 @@
     <select id="count" parameterType="java.util.Map" resultType="java.lang.Integer">
         SELECT COUNT(1) FROM t_aidea_consult_sheet a
         LEFT JOIN t_qyuser b ON b.id = a.doctor_id
-        LEFT JOIN t_qyuser c ON c.id = a.customer_id
+        LEFT JOIN t_qyuser c ON c.id = a.service_id
         LEFT JOIN `user` u ON u.userid = b.id
         <include refid="sqlWhere"/>
 
@@ -191,9 +191,9 @@
         <include refid="sqlColumns"/>
         FROM t_aidea_consult_sheet a
         LEFT JOIN t_qyuser b ON b.id = a.doctor_id
-        LEFT JOIN t_qyuser c ON c.id = a.customer_id
+        LEFT JOIN t_qyuser c ON c.id = a.service_id
         <include refid="sqlWhere"/>
-        <if test="id!=null">and (a.doctor_id = ${id} or a.customer_id =${id} )</if>
+        <if test="id!=null">and (a.doctor_id = ${id} or a.a.service_id =${id} )</if>
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
         <if test="limit>0">limit #{offset},#{limit}</if>
     </select>

aidea-modules/order-detail-module-web/src/main/webapp/WEB-INF/views/orderDetails/orderDetailslist.html

@@ -76,8 +76,10 @@
                 <div class="col-xs-12">
                     <div class="box">
                         <div class="box-header">
+
                             <form id="seachTableForm" action="#springUrl('/a/orderDetails/list')" method="get">
-                                    <input type="hidden" id="id" name="id" value="${id}"/>
+                                <input type="hidden" id="idTmp" name="idTmp" value="${id}"/>
+                                <input type="hidden" id="isDetail" name="isDetail" value="${isDetail}"/>
                                     <div class="col-xs-2" >
                                         <input  type="text" class="form-control "
                                                 id="orderCode" name="orderCode" placeholder="订单编码">
@@ -112,8 +114,6 @@
                                     <th>创建时间</th>
                                     <th>erp物料号</th>
                                     <th>操作</th>
-
-
                                 </tr>
                                 </thead>
                                 <tbody id="tablebody">
@@ -171,18 +171,27 @@
 
     function seachTable() {
         var sSource = "#springUrl('/a/orderDetails/listData')";
-        var aoData = {
-            iDisplayStart: 1,
-            iDisplayLength: 10,
-        }
         var retrieveData = function (sSource, aoData, fnCallback) {
-
             $("#seachTableForm input").each(function () {
-                var params = {
-                    name: $(this).attr("name"),
-                    value: $(this).val()
-                };
-                aoData.push(params);
+                if($(this).attr('id')=='idTmp'){
+                    let val = $("#idTmp").val();
+                    if (val=="${id}"&&$("#isDetail").val()=='N'){
+                        val="";
+                    }
+                    var params = {
+                        name: "idTmp",
+                        value: val,
+                    };
+                    aoData.push(params);
+                }else{
+                    var params = {
+                        name: $(this).attr("name"),
+                        value: $(this).val(),
+                    };
+                    aoData.push(params);
+                }
+
+
             })
 
             $.ajax({
@@ -211,18 +220,16 @@
                 },
                 {
                     "mData": "orderCode"
-                }
-                ,
+                },
                 {
                     "mData": "drugsCode"
                 },
                 {
-                    "mData": "drugsName"
+                    "mData": "productName"
                 },
                 {
                     "mData": "price"
-                }
-                ,
+                },
                 {
                     "mData": "drugsNum"
                 },
@@ -234,12 +241,10 @@
                 },
                 {
                     "mData": "createTime"
-                }
-                ,
+                },
                 {
                     "mData": "drugsMateriel"
-                }
-                ,
+                },
                 {
                     "mData": "id"
                 }],
@@ -265,7 +270,7 @@
                     }
                 },{
                     "aTargets": [3],
-                    "mData": "drugsName",
+                    "mData": "productName",
                     "mRender": function (a, b, c, d) {
                         return a;
 
@@ -274,7 +279,7 @@
                     "aTargets": [4],
                     "mData": "price",
                     "mRender": function (a, b, c, d) {
-                        return a;
+                        return c.price.toFixed(2);
 
                     }
                 },{
@@ -288,7 +293,7 @@
                     "aTargets": [6],
                     "mData": "amount",
                     "mRender": function (a, b, c, d) {
-                        return a;
+                        return c.amount.toFixed(2);
 
                     }
                 },

aidea-modules/order-detail-module/src/main/java/com/cftech/orderdetail/dao/OrderDetailsMapper.xml

@@ -7,7 +7,6 @@
         <result column="order_id" property="orderId"/>
         <result column="order_code" property="orderCode"/>
         <result column="drugs_id" property="drugsId"/>
-        <result column="drugs_name" property="drugsName"/>
         <result column="openid" property="openid"/>
         <result column="price" property="price"/>
         <result column="amount" property="amount"/>
@@ -22,7 +21,7 @@
         <result column="description" property="description"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by" property="updateBy"/>
-        <result column="drugs_name" property="drugsName"/>
+        <result column="product_name" property="productName"/>
     </resultMap>
 
     <sql id="sqlWhere">
@@ -53,7 +52,7 @@
     </sql>
 
     <sql id="sqlColumns">
-                                 d.id,
+   	d.id,
 	d.order_id,
 	d.order_code,
 	d.drugs_id,
@@ -72,7 +71,7 @@
 	d.description,
 	d.create_by,
 	d.update_by,
-	d.drugs_name
+	t.product_name
                         </sql>
 
 
@@ -111,7 +110,7 @@
         SELECT
         <include refid="sqlColumns"/>
         FROM t_order_details d
-        LEFT JOIN t_aidea_product p ON p.id = d.drugs_id
+        LEFT JOIN t_aidea_product t ON t.id = d.drugs_id
         WHERE d.id=#{id}
     </select>
 
@@ -126,6 +125,7 @@
           <include refid="sqlColumns"/>
         FROM t_order_details d
         LEFT JOIN t_order o ON o.id = d.order_id
+        LEFT JOIN t_aidea_product t ON d.drugs_id = t.id
         <include refid="sqlWhere"/>
         <if test="userId!=null"> AND (o.service_id = ${userId} OR o.clerk_id = ${userId} OR o.doctor_id = ${userId}) </if>
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>

aidea-modules/order-detail-module/src/main/java/com/cftech/orderdetail/model/OrderDetails.java

@@ -29,7 +29,7 @@ public class OrderDetails implements Serializable {
     private Long drugsId;
     /* 商品名称 */
     @ExportConfig(value = "商品名称", width = 100, showLevel = 1)
-    private String drugsName;
+    private String productName;
     /* 商品数量 */
     @ExportConfig(value = "商品数量", width = 100, showLevel = 1)
     private Long drugsNum;

aidea-modules/order-detail-module/src/main/java/com/cftech/orderdetail/service/OrderDetailsService.java

@@ -24,5 +24,5 @@ public interface OrderDetailsService extends GenericService<OrderDetails> {
      * @param iDisplayStart
      * @param iDisplayLength
      */
-    List<OrderDetails> fetchSearchByPageByUser(String userId, Conds conds, Sort sort, int iDisplayStart, int iDisplayLength,Long id);
+    List<OrderDetails> fetchSearchByPageByUser(String userId, Conds conds, Sort sort, int iDisplayStart, int iDisplayLength,Long idTmp);
 }

aidea-modules/order-detail-module/src/main/java/com/cftech/orderdetail/service/impl/OrderDetailsServiceImpl.java

@@ -35,12 +35,12 @@ return orderDetailsMapper;
 }
 
     @Override
-    public List<OrderDetails> fetchSearchByPageByUser(String userId, Conds conds, Sort sort, int page, int pageSize,Long id) {
+    public List<OrderDetails> fetchSearchByPageByUser(String userId, Conds conds, Sort sort, int page, int pageSize,Long idTmp) {
         Map<String, Object> params = new HashMap<String, Object>();
         if (!StringUtils.equals(userId, "1")) {
             params.put("userId", userId);
         }
-        params.put("id", id);
+        params.put("idTmp", idTmp);
         params.put("conds", conds);
         params.put("offset", page > 0 ? page : 0);
         params.put("limit", pageSize > 0 ? pageSize : 0);

aidea-modules/order-detail-module/src/main/java/com/cftech/orderdetail/web/OrderDetailsController.java

@@ -61,6 +61,9 @@ public class OrderDetailsController {
         Long accountId = UserUtils.getmpaccounts(request);
         model.addAttribute("accountId", accountId);
         model.addAttribute("id",id);
+        if(id==null){
+            model.addAttribute("isDetail",'N');
+        }
         return "orderDetails/orderDetailslist";
     }
 
@@ -107,7 +110,7 @@ public class OrderDetailsController {
     @RequiresPermissions(value = ORDERDETAILS_VIEW)
     @RequestMapping(value = "/listData")
     @ResponseBody
-    public JSONObject listData(int iDisplayStart, int iDisplayLength, OrderDetails orderDetails,Long id, HttpServletRequest request) {
+    public JSONObject listData(int iDisplayStart, int iDisplayLength, OrderDetails orderDetails,Long idTmp, HttpServletRequest request) {
         Long accountsId = UserUtils.getmpaccounts(request);
         String userId = String.valueOf(UserUtils.getUser().getId());
 
@@ -119,19 +122,18 @@ public class OrderDetailsController {
             conds.like("d.drugs_code", orderDetails.getDrugsCode());
         if (StringUtils.isNoneBlank(orderDetails.getOrderCode()))
             conds.like("d.order_code", orderDetails.getOrderCode());
-        if (id!=null){
-            conds.equal("d.order_id",id);
+        if (idTmp!=null && !"".equals(idTmp)){
+            conds.equal("d.order_id",idTmp);
         }
 
         Sort sort = new Sort("d.create_time", OrderType.DESC);
 
-        List<OrderDetails> list =  orderDetailsService.fetchSearchByPageByUser(userId, conds, sort, iDisplayStart, iDisplayLength,id);
-        String string = JSON.toJSONString(list, DOUBLE_JSON_FILTER, SerializerFeature.WriteMapNullValue);
+        List<OrderDetails> list =  orderDetailsService.fetchSearchByPageByUser(userId, conds, sort, iDisplayStart, iDisplayLength,idTmp);
         Integer counts = orderDetailsService.count(conds);
         JSONObject rtnJson = new JSONObject();
         rtnJson.put("iTotalRecords", counts);
         rtnJson.put("iTotalDisplayRecords", counts);
-        rtnJson.put("aaData", string);
+        rtnJson.put("aaData", list);
         return rtnJson;
     }
 

aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderform.html

@@ -418,8 +418,9 @@
         const id = $(event.target).siblings("#idDetail").val();
         $.ajax({
             url: url,
-            type: "GET",
+            type: "POST",
             data : {
+                _csrf:csrf,_csrf_header:csrf_header,
                 id:id
             },
             success :function (rsp) {

aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlist.html

@@ -156,6 +156,8 @@
 <!-- AdminLTE for demo purposes -->
 <script src="common/js/cfapp.js"></script>
 <script>
+    var csrf='${_csrf.token}';
+    var csrf_header='${_csrf.headerName}';
     function formatDates(now) {
         var now = new Date(now);
         var year = now.getFullYear();
@@ -356,7 +358,7 @@
                             '</button>\n' +
                             '<ul class="dropdown-menu" role="menu">\n';
                         html += '<li><a href="#springUrl("/a/order/form?id=' + a + '")">查看</a></li>';
-                        html += '<li><a href="#springUrl("/a/order/findorderDetail?id=' + a + '")">查看需求清单明细</a></li>';
+                        html += '<li><a href="#springUrl("/a/order/findorderDetail?id=' + a + '&isDetail=y")">查看需求清单明细</a></li>';
                         html += '<li><a href="#springUrl("/a/order/sendOut?id=' + a + '")">订单出库</a></li>';
                         html += '</ul>';
                         html += '#end';
@@ -395,7 +397,7 @@
                 $.ajax({
                     type: "POST",
                     url: "#springUrl('/a/order/delete')",
-                    data: {id: data},
+                    data: {_csrf:csrf,_csrf_header:csrf_header,id: data},
                     dataType: "json",
                     success: function (data) {
                         if (data.errorNo == 0) {

aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderMobile.java

 package com.cftech.order.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import java.util.Date;
@@ -31,6 +32,7 @@ public class OrderMobile {
     /*状态*/
     private Long status;
     /*订单创建时间*/
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     /*收货人姓名*/
     private String addressName;

aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java

@@ -163,7 +163,8 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
                     orderMobile.setProductMobile(mobiles);
                 }
             }
-            object.put("orderMobiles",orderMobiles);
+            com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderMobiles));
+            object.put("orderMobiles",jsonObject);
             rtnJson.put("errorNo","0");
             rtnJson.put("data",object);
         }catch (Exception e){

aidea-modules/order-module/src/main/java/com/cftech/order/web/OrderController.java

@@ -230,7 +230,7 @@ public class OrderController {
 
     @RequestMapping("/findorderDetail")
     public String findorderDetail(HttpServletRequest request, Model model,Long id) {
-
+        model.addAttribute("isDetail",'y');
         return orderDetailsController.list(request,model,id);
     }
     @RequestMapping("/deleteAll")

aidea-modules/reportform-module-web/src/main/webapp/WEB-INF/views/reportForm/reportFormlist.html

@@ -76,7 +76,7 @@
                 <div class="col-xs-12">
                     <div class="box">
                         <div class="box-header">
-                            <form id="seachTableForm" action="#springUrl('/a/reportForm/list')" method="get">
+                            <form id="seachTableForm" action="#springUrl('/a/reportForm/list')" method="post">
 
                                     <div class="col-xs-2" >
                                         <input  type="text" class="form-control "
@@ -88,7 +88,7 @@
                                     </div>
                                     <div class="col-xs-2" >
                                         <input  type="text" class="form-control "
-                                                id="orderCode" name="orderCode" placeholder="订单号">
+                                                id="number" name="number" placeholder="订单号">
                                     </div>
                                     <div class="col-xs-2" >
                                         <input  type="text" class="form-control "
@@ -160,6 +160,10 @@
         src="plugins/jquery-validation/js/jquery.validate.min.js"></script>
 <!-- AdminLTE for demo purposes -->
 <script src="common/js/cfapp.js"></script>
+<script>
+    var csrfheader = {name: '_csrf_header', value: '${_csrf.headerName}'};
+    var csrftoken = {name: '_csrf', value: '${_csrf.token}'};
+</script>
 <script>
     function formatDates(now) {
         var now = new Date(now);
@@ -217,7 +221,7 @@
                     "mData": "customerName"
                 },
                 {
-                    "mData": "orderCode"
+                    "mData": "number"
                 }
                 ,
                 {
@@ -253,7 +257,7 @@
                     }
                 },{
                     "aTargets": [2],
-                    "mData": "orderCode",
+                    "mData": "number",
                     "mRender": function (a, b, c, d) {
                         return a;
                     }
@@ -314,7 +318,7 @@
                 $.ajax({
                     type: "POST",
                     url: "#springUrl('/a/reportForm/delete')",
-                    data: {id: data},
+                    data: {_csrf_header: csrfheader.value, _csrf: csrftoken.value,id: data},
                     dataType: "json",
                     success: function (data) {
                         if (data.errorNo == 0) {

aidea-modules/reportform-module/src/main/java/com/cftech/reportform/dao/ReportFormMapper.xml

@@ -42,12 +42,12 @@
     </sql>
 
     <sql id="sqlColumns">
-q.`name`
+	q.`name`
 AS pharmacist,
 t.`name` AS customerName,
-o.order_code AS orderCode,
+o.number,
 o.order_amount AS order_amount,
-o.number AS numberCode
+c.consult_id AS numberCode
                         </sql>
 
 
@@ -82,6 +82,7 @@ o.number AS numberCode
         SELECT COUNT(1) FROM t_order o
         LEFT JOIN t_qyuser t ON t.id = o.service_id
         LEFT JOIN t_qyuser q ON q.id = o.doctor_id
+        LEFT JOIN t_aidea_consult_sheet c ON c.order_id = o.id
         <include refid="sqlWhere"/>
 
     </select>
@@ -92,6 +93,7 @@ o.number AS numberCode
         FROM t_order o
         LEFT JOIN t_qyuser t ON t.id = o.service_id
         LEFT JOIN t_qyuser q ON q.id = o.doctor_id
+        LEFT JOIN t_aidea_consult_sheet c ON c.order_id = o.id
         <include refid="sqlWhere"/>
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
         <if test="limit>0">limit #{offset},#{limit}</if>

aidea-modules/reportform-module/src/main/java/com/cftech/reportform/model/ReportForm.java

@@ -22,7 +22,7 @@ public class ReportForm implements Serializable {
     private String customerName;
     /*订单编号*/
     @ExportConfig(value = "订单编号", width = 100, showLevel = 1)
-    private String orderCode;
+    private String number;
     /*订单金额*/
     @ExportConfig(value = "订单金额", width = 100, showLevel = 1)
     private Double orderAmount;

aidea-modules/reportform-module/src/main/java/com/cftech/reportform/web/ReportFormController.java

@@ -105,9 +105,15 @@ public class ReportFormController {
         Conds conds = new Conds();
         conds.equal("o.del_flag", Constants.DEL_FLAG_0);
         conds.equal("o.accounts_id", accountsId);
-        conds.like("t.`name`",reportForm.getCustomerName());
-        conds.like("q.`name`",reportForm.getPharmacist());
-        conds.like("o.order_code",reportForm.getOrderCode());
+        if (!org.apache.commons.lang3.StringUtils.isEmpty(reportForm.getCustomerName())) {
+            conds.like("t.`name`", reportForm.getCustomerName());
+        }
+        if (!org.apache.commons.lang3.StringUtils.isEmpty(reportForm.getPharmacist())) {
+            conds.like("q.`name`", reportForm.getPharmacist());
+        }
+        if (!org.apache.commons.lang3.StringUtils.isEmpty(reportForm.getNumber())) {
+            conds.like("o.number", reportForm.getNumber());
+        }
         Sort sort = new Sort("o.create_time", OrderType.DESC);
         List<ReportForm> list = reportFormService.fetchSearchByPage(conds, sort, iDisplayStart, iDisplayLength);
         Integer counts = reportFormService.count(conds);

aidea-modules/waybill-module/src/main/java/com/cftech/waybill/utils/ExpressOrderInfoUtils.java

@@ -63,7 +63,7 @@ public class ExpressOrderInfoUtils {
             JSONArray cargoDetails = new JSONArray();
             for (OrderDetails orderd: orderDetails) {
                 JSONObject cargo = new JSONObject();
-                cargo.put("name", orderd.getDrugsName());//商品名称
+                cargo.put("name", orderd.getProductName());//商品名称
                 cargo.put("count", 1);//商品数量
                 cargo.put("unit", "盒");//商品单位
                 cargo.put("amount", orderd.getPrice());//商品价格

aidea-modules/waybill-module/src/main/java/com/cftech/waybill/utils/FqHttpUtils.java

@@ -255,7 +255,7 @@ public class FqHttpUtils {
 
         List<OrderDetails> orders = new ArrayList<>();
         OrderDetails orderDetail = new OrderDetails();
-        orderDetail.setDrugsName("药品");
+        orderDetail.setProductName("药品");
         orderDetail.setPrice(123.4);
 
 

cms-modules/cms-core-module-web/src/main/webapp/WEB-INF/views/cfarticle/cfarticlelist.html

@@ -867,42 +867,49 @@
     var or = 0;
 
     function onreco(e) {
-        if (e.target.value == 1){
-            Cfapp.alert({
+        if (e.target.value == 1) {
+            Cfapp.confirm({
                 message: "是否确认取消推荐",
                 btntext: "确定",
                 success: function () {
                     select(e)
+                },
+                cancel: function () {
+                    location.href = "#springUrl('/a/cfarticle/list')";
                 }
             });
-        }else{
+        } else {
             f(e)
         }
 
     }
 
     function onBanner(e) {
-        if (e.target.value == 1){
-            Cfapp.alert({
+        if (e.target.value == 1) {
+            Cfapp.confirm({
                 message: "是否确认取消推荐",
                 btntext: "确定",
+                btncanceltext: "取消",
                 success: function () {
                     select(e)
+                },
+                cancel: function () {
+                    location.href = "#springUrl('/a/cfarticle/list')";
                 }
             });
-        }else{
+        } else {
             b(e)
         }
     }
 
     function select(e) {
-                if (e.target.value == '0') {
-                    e.target.value = '1'
-                } else if (e.target.value == '1') {
-                    e.target.value = '0'
-                }
+        if (e.target.value == '0') {
+            e.target.value = '1'
+        } else if (e.target.value == '1') {
+            e.target.value = '0'
+        }
 
-            save()
+        save()
 
 
     }
@@ -915,12 +922,12 @@
         var url = "#springUrl('/a/cfarticle/selectYes')"
         $.ajax({
             url: url,
-            type: "GET",
-            data: {},
+            type: "POST",
+            data: {_csrf_header: csrfheader.value, _csrf: csrftoken.value},
             success: function (rsp) {
 
                 if (rsp.errorNo == "0") {
-                    if (rsp.data >= 4 ) {
+                    if (rsp.data >= 4) {
                         Cfapp.alert({
                             message: "所选推荐不能超过四个",
                             btntext: "确定",
@@ -929,13 +936,17 @@
                             }
                         });
 
-                    }else {
-                        Cfapp.alert({
+                    } else {
+                        Cfapp.confirm({
                             message: "是否确认推荐",
                             btntext: "确定",
+                            btncanceltext: "取消",
                             success: function () {
                                 select(e)
                                 $('#myModal').modal('show')
+                            },
+                            cancel: function () {
+
                             }
                         });
                     }
@@ -944,12 +955,13 @@
 
         });
     }
+
     function b() {
         var url = "#springUrl('/a/cfarticle/selectBanner')"
         $.ajax({
             url: url,
-            type: "GET",
-            data: {},
+            type: "POST",
+            data: {_csrf_header: csrfheader.value, _csrf: csrftoken.value},
             success: function (rsp) {
 
                 if (rsp.errorNo == "0") {
@@ -959,16 +971,22 @@
                             btntext: "确定",
                             success: function () {
                                 location.href = "#springUrl('/a/cfarticle/list')";
+                            },
+                            cancel: function () {
+                                location.href = "#springUrl('/a/cfarticle/list')";
                             }
                         });
 
-                    }else {
-                        Cfapp.alert({
+                    } else {
+                        Cfapp.confirm({
                             message: "是否确认推荐",
                             btntext: "确定",
                             success: function () {
                                 select(e)
                                 $('#myModal').modal('show')
+                            } ,
+                            cancel: function () {
+                                location.href = "#springUrl('/a/cfarticle/list')";
                             }
                         });
 
@@ -978,6 +996,7 @@
 
         });
     }
+
     function save() {
         var datas = [];
         var counta = 0;
@@ -998,9 +1017,9 @@
         var url = "#springUrl('/a/cfarticle/updatecom')"
         $.ajax({
             url: url,
-            type: "GET",
+            type: "POST",
             dateType: 'json',
-            data: {datas: JSON.stringify(datas)},
+            data: {_csrf_header: csrfheader.value, _csrf: csrftoken.value,datas: JSON.stringify(datas)},
             success: function (rsp) {
                 console.log(rsp);
                 if (rsp.errorNo == "0") {
@@ -1011,7 +1030,7 @@
                             location.href = "#springUrl('/a/cfarticle/list')";
                         }
                     });
-                }else {
+                } else {
                     Cfapp.alert({
                         message: "修改失败",
                         btntext: "确定",
@@ -1112,6 +1131,7 @@
     }
 
 
+
 </script>
 
 </body>

cms-modules/cms-core-module/src/main/java/com/cftech/cms/cfarticle/model/CfarticleVO.java

 package com.cftech.cms.cfarticle.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.cftech.core.poi.ExportConfig;
 import lombok.Data;
 
@@ -30,6 +31,7 @@ public class CfarticleVO {
     /* 分类名称 */
     private String remarks;
     /* 创建时间 */
+
     private Date createTime;
     /*阅读量*/
     private Long reading;

cms-modules/cms-core-module/src/main/java/com/cftech/cms/cfarticle/web/CfarticleController.java

@@ -509,8 +509,8 @@ public class CfarticleController {
     @RequestMapping(value = "/updatecom")
     @ResponseBody
     public JSONObject updatecom(String datas){
-        JSONObject updatecom = cfarticleService.updatecom(datas);
-        return updatecom;
+
+        return  cfarticleService.updatecom(datas);
     }
     @RequestMapping(value = "/selectYes")
     @ResponseBody

membercard-modules/shipping-address-web/src/main/webapp/WEB-INF/views/address/addressform.html

@@ -192,7 +192,8 @@
 <script src="common/js/cfapp.js"></script>
 <!-- END PAGE LEVEL PLUGINS -->
 <script>
-
+    var csrfheader = {name:'_csrf_header',value:'${_csrf.headerName}'};
+    var csrftoken  = {name:'_csrf',value:'${_csrf.token}'};
     let areaList=null
    let listProvince=null
    let listCity=null
@@ -205,9 +206,9 @@ function tijiao(){
         var  address =$("#address").val();
         var id= $("#id").val();
     $.ajax({
-        type: "GET",   //提交的方法
+        type: "POST",   //提交的方法
         url:url, //提交的地址
-        data:{ id,provinceId,cityId,areaId,address},// 序列化表单值
+        data:{"_csrf_header":csrfheader.value,"_csrf":csrftoken.value, id,provinceId,cityId,areaId,address},// 序列化表单值
         async: false,
         success: function(data) {  //成功
 

membercard-modules/shipping-address-web/src/main/webapp/WEB-INF/views/address/addresslist.html

@@ -169,7 +169,8 @@
 <script src="common/js/cfapp.js"></script>
 <script>
 
-
+    var csrfheader = {name:'_csrf_header',value:'${_csrf.headerName}'};
+    var csrftoken  = {name:'_csrf',value:'${_csrf.token}'};
     let areaList = null
     let listProvince = null
     let listCity = null
@@ -430,7 +431,7 @@
                 $.ajax({
                     type: "POST",
                     url: "#springUrl('/a/address/delete')",
-                    data: {id: data},
+                    data: {id: data,"_csrf_header":csrfheader.value,"_csrf":csrftoken.value},
                     dataType: "json",
                     success: function (data) {
                         if (data.errorNo == 0) {

mp-modules/mp-fanss-module-web/src/main/webapp/WEB-INF/views/fanssgroup/fanssgrouplist.html

@@ -159,10 +159,10 @@
 				})
 
 				$.ajax({
-					"type" : "GET",
+					"type" : "POST",
 					"url" : sSource,
 					"dataType" : "json",
-					"data" : aoData, //以json格式传递
+					"data" : {aoData,"_csrf_header":csrfheader.value,"_csrf":csrftoken.value}, //以json格式传递
 					"success" : fnCallback
 				});
 			};