fix：报表修改

aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetform.html

@@ -330,6 +330,7 @@
                                                 <th>订单编码</th>
                                                 <th>用药人姓名</th>
                                                 <th>审核状态</th>
+                                                <th>订单状态</th>
                                                 <th>拒绝原由</th>
                                                 <th>提交时间</th>
                                                 <th>审核时间</th>
@@ -1054,6 +1055,9 @@
                 {
                     "mData": "status"
                 },
+                {
+                    "mData": "orderStatus"
+                },
                 {
                     "mData": "description"
                 },
@@ -1121,17 +1125,27 @@
                 },
                 {
                     "aTargets": [5],
-                    "mData": "drugNum",
+                    "mData": "orderStatus",
                     "mRender": function (a, b, c, d) {
-                        if (a) {
-                            return a;
+                        if (a == '0') {
+                            return "<span style='color:RGB(100,160,240)'>待确认</span>";
+                        } else if (a == '1') {
+                            return "<span style='color:RGB(255,51,0)'>待付款</span>";
+                        } else if (a == '2') {
+                            return "<span>待发货</span>";
+                        } else if (a == '3') {
+                            return "<span'>待收货</span>";
+                        } else if (a == '4') {
+                            return "<span>已完成</span>";
+                        } else if (a == '5') {
+                            return "<span>已取消</span>";
                         } else {
-                            return null;
+                            return "";
                         }
                     }
                 },
                 {
-                    "aTargets": [6],
+                    "aTargets": [7],
                     "mData": "createTime",
                     "mRender": function (a, b, c, d) {
                         if (a) {
@@ -1142,7 +1156,7 @@
                     }
                 },
                 {
-                    "aTargets": [7],
+                    "aTargets": [8],
                     "mData": "auditTime",
                     "mRender": function (a, b, c, d) {
                         if (a) {
@@ -1153,7 +1167,7 @@
                     }
                 },
                 {
-                    "aTargets": [8],
+                    "aTargets": [9],
                     "mData": "prescription",
                     "mRender": function (a, b, c, d) {
                         if (a) {

aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetlist.html

@@ -91,6 +91,7 @@
                                     <select id="isThree" name="isThree" class="form-control required">
                                         <option value="">请选择患者类型</option>
                                         <option value="1">三期患者</option>
+                                        <option value="-1">非三期</option>
                                     </select>
                                 </div>
 

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

@@ -226,6 +226,7 @@
         LEFT JOIN wx_mp_fanss f ON f.openid = a.open_id AND f.delflag = '0'
         <include refid="sqlWhere"/>
         <if test="userid!=null">and (a.doctor_id = ${userid} or a.service_id =${userid})</if>
+        <if test="isThree==-1">AND (m.status IS NULL OR m.status != '1')</if>
     </select>
 
     <select id="fetchSearchByPage" parameterType="java.util.Map" resultType="com.cftech.consultsheet.model.ConsultSheet">
@@ -249,8 +250,8 @@
         LEFT JOIN t_aidea_member_group g ON FIND_IN_SET(g.id, m.member_id) != 0 AND g.del_flag = '0'
         LEFT JOIN wx_mp_fanss f ON f.openid = a.open_id AND f.delflag = '0'
         <include refid="sqlWhere"/>
-        <if test="userid!=null">AND (a.doctor_id = ${userid} or a.service_id =${userid})</if>
-        AND a.open_id NOT IN (SELECT open_id FROM wx_mp_member WHERE status = '0' AND del_flag = '0')
+        <if test="userid!=null">AND (a.doctor_id = ${userid} OR a.service_id =${userid})</if>
+        <if test="isThree==-1">AND (m.status IS NULL OR m.status != '1')</if>
         GROUP BY a.id
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
         <if test="limit>0">limit #{offset},#{limit}</if>

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/ConsultSheetService.java

@@ -45,7 +45,7 @@ public interface ConsultSheetService extends GenericService<ConsultSheet> {
      * @param userid
      * @return
      */
-    List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long userid);
+    List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long userid, String isThree);
 
     /**
      * 咨询单列表统计查询
@@ -53,7 +53,7 @@ public interface ConsultSheetService extends GenericService<ConsultSheet> {
      * @param userid
      * @return
      */
-    Integer fetchSearchByCount(Conds conds, Long userid);
+    Integer fetchSearchByCount(Conds conds, Long userid, String isThree);
 
     /**
      * 提交咨询单且轮询对应客服、医生进行处理

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java

@@ -22,6 +22,8 @@ import com.cftech.core.util.Constants;
 import com.cftech.core.util.MpTokenUtil;
 import com.cftech.core.util.StringUtils;
 import com.cftech.core.util.SystemConfig;
+import com.cftech.member.model.FanssVO;
+import com.cftech.member.model.Member;
 import com.cftech.member.service.MemberService;
 import com.cftech.mp.fans.model.MpFanssEntity;
 import com.cftech.mp.fans.service.MpFanssService;
@@ -31,6 +33,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -97,17 +100,20 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
     }
 
     @Override
-    public Integer fetchSearchByCount(Conds conds, Long userid) {
+    public Integer fetchSearchByCount(Conds conds, Long userid, String isThree) {
         Map<String, Object> params = new HashMap<>();
         params.put("conds", conds);
         if (userid != null && userid != 1) {
             params.put("userid", userid);
         }
+        if (StringUtils.equals("-1", isThree)) {
+            params.put("isThree", isThree);
+        }
         return consultSheetMapper.fetchSearchByCount(params);
     }
 
     @Override
-    public List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long userid) {
+    public List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long userid, String isThree) {
         Map<String, Object> params = new HashMap<>();
         params.put("conds", conds);
         params.put("offset", page > 0 ? page : 0);
@@ -116,6 +122,9 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
         if (userid != null && userid != 1) {
             params.put("userid", userid);
         }
+        if (StringUtils.equals("-1", isThree)) {
+            params.put("isThree", isThree);
+        }
         return consultSheetMapper.fetchSearchByPage(params);
     }
 
@@ -215,7 +224,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
         conds.equal("o.openid", openid);
         conds.in("o.status", new String[]{"4"});// 4:已成交
         Sort sort = new Sort("o.create_time", OrderType.DESC);
-        List<Order> orders = orderService.fetchSearchBy(conds, sort, 0, 0, null, null, null);
+        List<Order> orders = orderService.fetchSearchBy(conds, sort, 0, 0, null, null, null, null);
         if (orders != null && orders.size() > 0 && orders.get(0) != null) { //复购
             Order order = orders.get(0);
 
@@ -346,12 +355,20 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
 
         String nickname = "";
         String fansAlias = "";
+        String patientType = "非三期";
         if (StringUtils.isNoneBlank(consultSheet.getOpenId())) {
             MpFanssEntity mpFanssEntity = mpFanssService.getWxUser(consultSheet.getOpenId());
             if (mpFanssEntity != null) {
                 nickname = StringUtils.isBlank(mpFanssEntity.getNickname()) ? "":mpFanssEntity.getNickname();
                 fansAlias = StringUtils.isBlank(mpFanssEntity.getStore()) ? "":mpFanssEntity.getStore();
             }
+            Conds mConds = new Conds();
+            mConds.equal("member.del_flag", Constants.DEL_FLAG_0);
+            mConds.equal("member.open_id", consultSheet.getOpenId());
+            List<Member> members = memberService.fetchSearchByPageServer(mConds, null, 0, 0);
+            if (!CollectionUtils.isEmpty(members) && StringUtils.equals("1", members.get(0).getStatus())) {
+                patientType = "三期";
+            }
         }
 
         //推送客服消息
@@ -360,7 +377,8 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
         if (service != null) {
             msg = SystemConfig.p.getProperty("QY_SEND_CUSTOMERSERVICE_MSG").replace("{NUMBER}", consultSheet.getConsultId())//
                     .replace("{NICKNAME}", nickname)//
-                    .replace("{FANSALIAS}", fansAlias);
+                    .replace("{FANSALIAS}", fansAlias)
+                    .replace("{PATIENTTYPE}", patientType);
             List<Qyuser> serviceUsers = new ArrayList();
             serviceUsers.add(service);
             JSONObject result = qyMsgUtil.sendText(accounts, false, serviceUsers, null, null, agenId, msg, false);
@@ -372,7 +390,8 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
         if (service != null) {
             msg = SystemConfig.p.getProperty("QY_SEND_DOCTOR_MSG").replace("{NUMBER}", consultSheet.getConsultId())//
                     .replace("{NICKNAME}", nickname)//
-                    .replace("{FANSALIAS}", fansAlias);
+                    .replace("{FANSALIAS}", fansAlias)
+                    .replace("{PATIENTTYPE}", patientType);
             List<Qyuser> doctorUsers = new ArrayList();
             doctorUsers.add(doctor);
             JSONObject result = qyMsgUtil.sendText(accounts, false, doctorUsers, null, null, agenId, msg, false);

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java

@@ -20,6 +20,7 @@ import com.cftech.consultsheet.model.ConsultSheetVO;
 import com.cftech.consultsheet.service.ConsultSheetService;
 import com.cftech.core.poi.ExcelKit;
 import com.cftech.core.scope.OrderType;
+import com.cftech.core.sql.Cond;
 import com.cftech.core.sql.Conds;
 import com.cftech.core.sql.Sort;
 import com.cftech.core.util.*;
@@ -53,6 +54,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -236,8 +238,9 @@ public class ConsultSheetController {
     @ResponseBody
     public JSONObject listData(int iDisplayStart, int iDisplayLength, ConsultSheet consultSheet, HttpServletRequest request) {
         Long userid = UserUtils.getUser().getUserid();
-        boolean leader = roleService.selectRoleEntityByUserId(UserUtils.getUser().getId(), Constants.SYSTEM_LEADER);
-        if (leader) {
+        boolean leader = roleService.selectRoleEntityByUserId(userid, Constants.SYSTEM_LEADER);
+        boolean manager = roleService.selectRoleEntityByUserId(userid, Constants.SYSTEM_STORAGEMANAGER);//订单员
+        if (leader || manager) {
             userid = 1L;//查看全部
         }
 
@@ -263,7 +266,6 @@ public class ConsultSheetController {
             } else {
                 conds.equal("o.status", consultSheet.getOrderStatus());
             }
-
         }
         if (consultSheet.getServiceId() != null) {
             conds.equal("a.service_id", consultSheet.getServiceId());
@@ -281,8 +283,8 @@ public class ConsultSheetController {
 
         Sort sort = new Sort("a.create_time", OrderType.DESC);
 
-        List<ConsultSheet> list = consultSheetService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, userid);
-        Integer counts = consultSheetService.fetchSearchByCount(conds, userid);
+        List<ConsultSheet> list = consultSheetService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, userid, consultSheet.getIsThree());
+        Integer counts = consultSheetService.fetchSearchByCount(conds, userid, consultSheet.getIsThree());
         JSONObject rtnJson = new JSONObject();
         rtnJson.put("iTotalRecords", counts);
         rtnJson.put("iTotalDisplayRecords", counts);
@@ -303,8 +305,8 @@ public class ConsultSheetController {
 
         Sort sort = new Sort("a.create_time", OrderType.DESC);
 
-        List<ConsultSheet> list = consultSheetService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, null);
-        Integer counts = consultSheetService.fetchSearchByCount(conds, null);
+        List<ConsultSheet> list = consultSheetService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, null, null);
+        Integer counts = consultSheetService.fetchSearchByCount(conds, null, null);
         JSONObject rtnJson = new JSONObject();
         rtnJson.put("iTotalRecords", counts);
         rtnJson.put("iTotalDisplayRecords", counts);
@@ -351,8 +353,12 @@ public class ConsultSheetController {
             conds.equal("m.status", "1");
         }
         if (StringUtils.isNoneBlank(consultSheet.getOrderStatus())) {
+            if (StringUtils.equals("-1", consultSheet.getOrderStatus())) {//待收货和已完成
+                conds.in("o.status", new String[]{ "3", "4" });
+            } else {
                 conds.equal("o.status", consultSheet.getOrderStatus());
             }
+        }
         if (StringUtils.isNoneBlank(consultSheet.getStatus())) {
             conds.equal("a.status", consultSheet.getStatus());
         }
@@ -373,7 +379,7 @@ public class ConsultSheetController {
             conds.equal("a.open_id", consultSheet.getOpenId());
         }
 
-        List<ConsultSheet> list = consultSheetService.fetchSearchByPage(conds, sort, 0, 0);
+        List<ConsultSheet> list = consultSheetService.fetchSearchBy(conds, sort, 0, 0, null, consultSheet.getIsThree());
         List<ConsultSheetVO> consultSheetVOS = new LinkedList<>();
         ConsultSheetVO consultSheetVO = null;
         StringBuffer tpl = new StringBuffer();
@@ -412,6 +418,13 @@ public class ConsultSheetController {
     @RequestMapping("/exportFromExcel")
     @RequiresPermissions(value = CONSULTSHEET_VIEW)
     public void exportFromExcel(HttpServletRequest request, HttpServletResponse response, ConsultSheet consultSheet) {
+        Long userid = UserUtils.getUser().getUserid();
+        boolean leader = roleService.selectRoleEntityByUserId(userid, Constants.SYSTEM_LEADER);
+        boolean manager = roleService.selectRoleEntityByUserId(userid, Constants.SYSTEM_STORAGEMANAGER);//订单员
+        if (leader || manager) {
+            userid = 1L;//查看全部
+        }
+
         Long accountId = UserUtils.getmpaccounts(request);
         Sort sort = new Sort("a.create_time", OrderType.ASC);
         Conds conds = new Conds();
@@ -426,11 +439,15 @@ public class ConsultSheetController {
         if (StringUtils.equals(consultSheet.getIsThree(), "1")) {
             conds.equal("m.status", "1");
         }
+        if (StringUtils.isNoneBlank(consultSheet.getStatus())) {
+            conds.equal("a.status", consultSheet.getStatus());
+        }
         if (StringUtils.isNoneBlank(consultSheet.getOrderStatus())) {
+            if (StringUtils.equals("-1", consultSheet.getOrderStatus())) {//待收货和已完成
+                conds.in("o.status", new String[]{ "3", "4" });
+            } else {
                 conds.equal("o.status", consultSheet.getOrderStatus());
             }
-        if (StringUtils.isNoneBlank(consultSheet.getStatus())) {
-            conds.equal("a.status", consultSheet.getStatus());
         }
         if (consultSheet.getServiceId() != null) {
             conds.equal("a.service_id", consultSheet.getServiceId());
@@ -449,7 +466,7 @@ public class ConsultSheetController {
             conds.equal("a.open_id", consultSheet.getOpenId());
         }
 
-        List<ConsultSheet> list = consultSheetService.fetchSearchByPage(conds, sort, 0, 0);
+        List<ConsultSheet> list = consultSheetService.fetchSearchBy(conds, sort, 0, 0, userid, consultSheet.getIsThree());
         List<ConsultSheetReportVo> consultSheetVOS = new LinkedList<>();
         ConsultSheetReportVo consultSheetVO = null;
         StringBuffer tpl = new StringBuffer();

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

@@ -181,6 +181,7 @@
                                     <select id="isThree" name="isThree" class="form-control required">
                                         <option value="">请选择患者类型</option>
                                         <option value="3">三期患者</option>
+                                        <option value="-1">非三期</option>
                                     </select>
                                 </div>
                                 <div class="col-xs-2">
@@ -587,7 +588,7 @@
                         } else if (a == '4') {
                             return "<span>已完成</span>";
                         } else if (a == '5') {
-                            return "<span>已取消</span>";
+                            return "<span style='color:#FF0000'>已取消</span>";
                         }
                     }
                 },

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

@@ -74,7 +74,8 @@
                 <div class="col-xs-12">
                     <div class="box">
                         <div class="box-header">
-                            <form id="seachTableForm" action="#springUrl('/a/order/list')" method="get">
+                            <form id="seachTableForm" action="#springUrl('/a/order/exportExcel')" method="get">
+                                <input type="text" class="form-control" name="excelName" placeholder="产品名称" value="需求清单出库">
                                 <div class="col-xs-2">
                                     <input type="text" class="form-control"
                                            name="number" value="" placeholder="订单编码">
@@ -85,13 +86,14 @@
                                 </div>
                                 <div class="col-xs-2">
                                     <input type="text" class="form-control"
-                                           name="productNameTmp" placeholder="产品名称">
+                                           name="courierNumber" placeholder="顺丰运单号">
                                 </div>
                                 <div class="col-xs-2">
                                     <input type="text" class="form-control"
-                                           name="courierNumber" placeholder="顺丰运单号">
+                                           name="productNameTmp" placeholder="产品名称">
                                 </div>
 
+
                                 <div class="col-xs-4">
                                     <div class="input-group date">
                                         <div class="input-group-addon">
@@ -105,33 +107,15 @@
 
                                 <div class="col-xs-2">
                                     <select  id="status" name="status" class="form-control required">
-                                        <!--<option value="">请选择订单状态</option>-->
-                                        <!--<option value="0">待确认</option>-->
-                                        <!--<option value="1">待付款</option>-->
                                         <option selected="selected" value="2">待发货</option>
                                         <option value="3">待收货</option>
-                                        <!--<option value="4">已完成</option>-->
-                                        <!--<option value="5">已取消</option>-->
                                     </select>
                                 </div>
 
-
-
-<!--                                <div class="col-xs-2">-->
-<!--                                    <div class="input-group date">-->
-<!--                                        <div class="input-group-addon">-->
-<!--                                            <i class="fa fa-calendar"></i>-->
-<!--                                        </div>-->
-<!--                                        <input type="text"-->
-<!--                                               class="form-control pull-right  datepicker"-->
-<!--                                               name="orderEndTime" placeholder="订单结束时间"-->
-<!--                                               readonly="readonly">-->
-<!--                                    </div>-->
-<!--                                </div>-->
-
                                 <div class="col-xs-2">
                                     <button type="button" class="search btn btn-primary">搜索</button>
                                     <button type="button" class="btn btn-info" onclick="clearSearch()">重置</button>
+                                    <button type="submit" class="search btn btn-primary">导出</button>
                                 </div>
 
                             </form>

aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml

@@ -265,6 +265,7 @@
             LEFT JOIN t_qyuser u ON o.service_id = u.id
             <include refid="sqlWhere"/>
             <if test="userid != null"> AND (o.service_id = ${userid} or o.doctor_id =${userid} or o.clerk_id = ${userid}) </if>
+            <if test="isThree==-1">AND (m.status IS NULL OR m.status != '1')</if>
             GROUP BY o.id
             <if test="orderAmount != null or payAmount != null">
                 HAVING 1=1
@@ -349,6 +350,7 @@
         LEFT JOIN t_qyuser u ON o.service_id = u.id
         <include refid="sqlWhere"/>
         <if test="userid != null"> AND (o.service_id = ${userid} or o.doctor_id =${userid} or o.clerk_id = ${userid}) </if>
+        <if test="isThree==-1"> AND (m.status IS NULL OR m.status != '1') </if>
         GROUP BY o.id
         <if test="orderAmount != null or payAmount != null">
             HAVING 1=1

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

@@ -29,9 +29,9 @@ public interface OrderService extends GenericService<Order> {
      * @param userid
      * @return
      */
-    List<Order> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long userid, String orderAmount, String payAmount);
+    List<Order> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long userid, String orderAmount, String payAmount, String isThree);
 
-    Integer count(Conds conds, Long userid, String orderAmount, String payAmount);
+    Integer count(Conds conds, Long userid, String orderAmount, String payAmount, String isThree);
 
     List<ProductOrder> listProduct();
 

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

@@ -111,7 +111,7 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
     }
 
     @Override
-    public List<Order> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long userid, String orderAmount, String payAmount) {
+    public List<Order> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long userid, String orderAmount, String payAmount, String isThree) {
         Map<String, Object> params = new HashMap<>();
         //非管理员查询所有
         if (userid != null && userid != 1L) {
@@ -127,6 +127,9 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
         } else if (StringUtils.isNoneBlank(payAmount)) {
             params.put("payAmount", payAmount);
         }
+        if (StringUtils.equals("-1", isThree)) {
+            params.put("isThree", isThree);
+        }
         params.put("conds", conds);
         params.put("offset", page > 0 ? page : 0);
         params.put("limit", pageSize > 0 ? pageSize : 0);
@@ -135,7 +138,7 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
     }
 
     @Override
-    public Integer count(Conds conds, Long userid, String orderAmount, String payAmount) {
+    public Integer count(Conds conds, Long userid, String orderAmount, String payAmount, String isThree) {
         Map<String, Object> params = new HashMap<String, Object>();
         //非管理员查询所有
         if (userid != null && userid != 1L) {
@@ -151,6 +154,9 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
         } else if (StringUtils.isNoneBlank(payAmount)) {
             params.put("payAmount", payAmount);
         }
+        if (StringUtils.equals("-1", isThree)) {
+            params.put("isThree", isThree);
+        }
         params.put("conds", conds);
         return orderMapper.count(params);
     }
@@ -552,7 +558,7 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
             Conds conds = new Conds();
             conds.equal("o.id", invoiceDto.getId());
             conds.equal("o.del_flag", Constants.DEL_FLAG_0);
-            List<Order> list = this.fetchSearchBy(conds, null, 0, 0, null, null, null);
+            List<Order> list = this.fetchSearchBy(conds, null, 0, 0, null, null, null, null);
             if (list != null && list.size() > 0) {
                 for (Order order : list) {
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -28,11 +28,9 @@ import com.cftech.orderdetail.model.OrderSplitBatchDto;
 import com.cftech.orderdetail.service.OrderDetailsService;
 import com.cftech.orderdetail.web.OrderDetailsController;
 import com.cftech.sys.model.User;
-import com.cftech.sys.model.UserRole;
 import com.cftech.sys.security.UserUtils;
 import com.cftech.sys.service.RoleService;
 import com.cftech.sys.service.UserService;
-import com.google.zxing.WriterException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -252,8 +250,8 @@ public class OrderController {
         Long accountsId = UserUtils.getmpaccounts(request);
         MpAccountsEntity mpAccountsEntity = accountsService.getDetail(accountsId);
 
-        boolean leader = roleService.selectRoleEntityByUserId(user.getId(), Constants.SYSTEM_LEADER);//药房主管
-        boolean manager = roleService.selectRoleEntityByUserId(user.getId(), Constants.SYSTEM_STORAGEMANAGER);//订单员
+        boolean leader = roleService.selectRoleEntityByUserId(user.getUserid(), Constants.SYSTEM_LEADER);//药房主管
+        boolean manager = roleService.selectRoleEntityByUserId(user.getUserid(), Constants.SYSTEM_STORAGEMANAGER);//订单员
         if (leader || manager) {
             userid = 1L;//药店主管
         }
@@ -306,8 +304,8 @@ public class OrderController {
         }
 
         Sort sort = new Sort("o.create_time", OrderType.DESC);
-        List<Order> list = orderService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, userid, order.getStartOrderAmount(), order.getStartPayAmount());
-        Integer counts = orderService.count(conds, userid, order.getStartOrderAmount(), order.getStartPayAmount());
+        List<Order> list = orderService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, userid, order.getStartOrderAmount(), order.getStartPayAmount(), order.getIsThree());
+        Integer counts = orderService.count(conds, userid, order.getStartOrderAmount(), order.getStartPayAmount(), order.getIsThree());
         //设置是否可以开票，拼接付款链接
         Date today = new Date();
         long longNum = 0;
@@ -332,24 +330,20 @@ public class OrderController {
         return rtnJson;
     }
 
-    public static void main(String[] args) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm");
-    }
-
     //开发票
     @RequiresPermissions(value = ORDER_EDIT)
     @RequestMapping("/invoice")
     @ResponseBody
     public JSONObject invoice(String id, HttpServletRequest request, String email) {
         JSONObject jsonObject = new JSONObject();
-        Long userid = UserUtils.getUser().getUserid();
+        //Long userid = UserUtils.getUser().getUserid();
         Long accountsId = UserUtils.getmpaccounts(request);
         try {
             Conds conds = new Conds();
             conds.in("o.id", id.split(","));
             conds.equal("o.del_flag", Constants.DEL_FLAG_0);
             conds.equal("o.accounts_id", accountsId);
-            List<Order> list = orderService.fetchSearchBy(conds, null, 0, 0, null, null, null);
+            List<Order> list = orderService.fetchSearchBy(conds, null, 0, 0, null, null, null, null);
             if (list != null && list.size() > 0) {
                 for (Order order : list) {
                     //订单为0无法开票
@@ -361,7 +355,7 @@ public class OrderController {
                     order.setCreateTimeStr(format.format(order.getCreateTime()));
                     String str = invoiceUtil.startInvoice(order, email, "0", null, null);
                     JSONObject json = JSON.parseObject(str);
-                    if (StringUtils.isNotBlank(json.getString("code")) && json.getString("code").equals("E0000")) {
+                    if (StringUtils.contains(str,"code") && StringUtils.equals("E0000", json.getString("code"))) {
                         //开票成功 添加一条开票记录
                         //流水号
                         String invoiceSerialNum = json.getJSONObject("result").getString("invoiceSerialNum");
@@ -378,8 +372,7 @@ public class OrderController {
                         invoice.setEmail(email);
                         invoice.setInvoiceSerialNum(invoiceSerialNum);
                         invoice.setOpenId(order.getOpenid());
-                        String userName = userService.fetchAuthById(userid).getWxUserName();
-                        invoice.setOperator(StringUtils.isEmpty(userName) ? "admin" : userName);
+                        invoice.setOperator(StringUtils.isBlank(UserUtils.getUser().getUsername()) ? "admin" : UserUtils.getUser().getUsername());
                         invoiceService.save(invoice);
 
                         //更新是否开票状态
@@ -387,7 +380,7 @@ public class OrderController {
                         orderService.update(order);
                     } else {
                         jsonObject.put("errorNo", 1);
-                        jsonObject.put("errorMsg", StringUtils.isEmpty(json.getString("describe")) ? json.getString("message") : json.getString("describe"));
+                        jsonObject.put("errorMsg", StringUtils.isBlank(json.getString("describe"))? json.getString("message") : json.getString("describe"));
                         return jsonObject;
                     }
                 }
@@ -395,6 +388,7 @@ public class OrderController {
             }
         } catch (Exception e) {
             jsonObject.put("errorNo", 1);
+            jsonObject.put("errorMsg", e.getMessage());
         }
         return jsonObject;
     }
@@ -449,7 +443,7 @@ public class OrderController {
 
     @RequestMapping("/exportExcel")
     @RequiresPermissions(value = ORDER_VIEW)
-    public void exportExcel(HttpServletRequest request, HttpServletResponse response, Order order) {
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, Order order, String excelName) {
         User user = UserUtils.getUser();
         Long userid = user.getUserid();
         Long accountsId = UserUtils.getmpaccounts(request);
@@ -486,9 +480,9 @@ public class OrderController {
             conds.like("f.store", order.getFansAlias());
         }
         //订单状态
-        if (StringUtils.equals("", order.getStatus())) {
+        if (StringUtils.equals("waitOp", order.getStatus())) {//待确认/待付款
             conds.in("o.status", new String[]{"0", "1"});
-        } else if (StringUtils.isNoneBlank(order.getStatus()) && !StringUtils.equals(order.getStatus(), "all")) {
+        } else if (StringUtils.isNoneBlank(order.getStatus())) {
             conds.equal("o.status", order.getStatus());
         }
         //三期患者
@@ -508,7 +502,7 @@ public class OrderController {
             conds.lessEqual("DATE_FORMAT(o.create_time, '%Y/%m/%d %H:%i')", dateArr[1]);
         }
 
-        List<Order> list = orderService.fetchSearchBy(conds, sort, 0, 0, userid, order.getStartOrderAmount(), order.getStartPayAmount());
+        List<Order> list = orderService.fetchSearchBy(conds, sort, 0, 0, userid, order.getStartOrderAmount(), order.getStartPayAmount(), order.getIsThree());
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         LinkedList<OrderVO> orderVOS = new LinkedList<>();
         OrderVO orderVO = null;
@@ -558,7 +552,7 @@ public class OrderController {
             orderVO.setCencalTime(orderObject.getCancelTime() != null ? simpleDateFormat.format(orderObject.getCancelTime()) : "");
             orderVOS.add(orderVO);
         }
-        ExcelKit.$Export(OrderVO.class, response).toExcel(orderVOS, "订单管理信息");
+        ExcelKit.$Export(OrderVO.class, response).toExcel(orderVOS, StringUtils.isBlank(excelName) ? "订单管理信息": excelName);
     }
 
     @RequestMapping("/templateExcel")

aidea-modules/reportform-module-web/src/main/webapp/WEB-INF/views/report/reportlist.html

@@ -137,9 +137,7 @@
 
                                 <div class="col-xs-5">
                                     <button type="button" class="search btn btn-primary">搜索</button>
-                                    #if($shiro.hasPermission("qy:report:edit"))
                                     <button type="submit" class="btn btn-primary">导出</button>
-                                    #end
                                 </div>
                             </form>
                         </div><!-- /.box-header -->

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

@@ -168,7 +168,6 @@ public class ReportController {
     }
 
     @RequestMapping("/exportExcel")
-    @RequiresPermissions(value = REPORT_VIEW)
     public void exportExcel(Report report, HttpServletRequest request,String startPayTime,String endPayTime, HttpServletResponse response) {
         Long accountId = UserUtils.getmpaccounts(request);
         Sort sort = new Sort("ord.create_time", OrderType.ASC);

cftech-common-web/src/main/resources/common-test.properties

@@ -36,9 +36,9 @@ QY_SEND_APPID=350
 #\u4F01\u4E1A\u53F7\u4F1A\u8BDD\u5185\u5BB9\u5B58\u6863
 QY_CHAT_WORK=351
 #\u63A8\u9001\u5BA2\u670D\u6D88\u606F\u6DFB\u52A0\u7528\u6237
-QY_SEND_CUSTOMERSERVICE_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u54A8\u8BE2\u5355\u7F16\u7801\uFF1A{NUMBER}\uFF0C\u6635\u79F0\uFF1A{NICKNAME}\uFF0C\u522B\u540D\uFF1A{FANSALIAS}
+QY_SEND_CUSTOMERSERVICE_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u54A8\u8BE2\u5355\u7F16\u7801\uFF1A{NUMBER}\uFF0C\u6635\u79F0\uFF1A{NICKNAME}\uFF0C\u522B\u540D\uFF1A{FANSALIAS}\uFF0C\u60A3\u8005\u7C7B\u578B\uFF1A{PATIENTTYPE}
 #\u63A8\u9001\u836F\u5E08\u6D88\u606F\u5BA1\u6279\u54A8\u8BE2\u5355
-QY_SEND_DOCTOR_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u8BF7\u5BA1\u6279\uFF0C\u54A8\u8BE2\u5355\u7F16\u7801\uFF1A{NUMBER}\uFF0C\u6635\u79F0\uFF1A{NICKNAME}\uFF0C\u522B\u540D\uFF1A{FANSALIAS}
+QY_SEND_DOCTOR_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u8BF7\u5BA1\u6279\uFF0C\u54A8\u8BE2\u5355\u7F16\u7801\uFF1A{NUMBER}\uFF0C\u6635\u79F0\uFF1A{NICKNAME}\uFF0C\u522B\u540D\uFF1A{FANSALIAS}\uFF0C\u60A3\u8005\u7C7B\u578B\uFF1A{PATIENTTYPE}
 #\u63A8\u9001\u8BA2\u5355\u5458\u53D1\u8D27\u6D88\u606F
 QY_SEND_ORDERCLERK_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u5F85\u53D1\u8D27\u8BA2\u5355\uFF0C\u8BA2\u5355\u7F16\u7801:
 #\u63A8\u9001\u5BA2\u670D\u8DDF\u8FDB\u63D0\u9192\u6D88\u606F
@@ -108,7 +108,7 @@ APP_SECRET=SD25624CC1DF4AB7
 KAIHUHANG_ADDRESS=\u6C5F\u82CF\u94F6\u884C\u626C\u5DDE\u5510\u57CE\u652F\u884C 90160188000128434
 CLERK=\u5415\u5029
 CHECKER=\u7530\u59DD
-PAYEE=\u6C6A\u8A00\u52C7
+PAYEE=\u7530\u59DD
 #\u5F00\u53D1\u7968\u63A5\u53E3
 INVOICE_API=nuonuo.ElectronInvoice.requestBillingNew
 #\u67E5\u8BE2\u53D1\u7968\u63A5\u53E3

cftech-common-web/src/main/resources/common.properties

@@ -36,9 +36,9 @@ QY_SEND_APPID=350
 #\u4F01\u4E1A\u53F7\u4F1A\u8BDD\u5185\u5BB9\u5B58\u6863
 QY_CHAT_WORK=351
 #\u63A8\u9001\u5BA2\u670D\u6D88\u606F\u6DFB\u52A0\u7528\u6237
-QY_SEND_CUSTOMERSERVICE_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u54A8\u8BE2\u5355\u7F16\u7801\uFF1A{NUMBER}\uFF0C\u6635\u79F0\uFF1A{NICKNAME}\uFF0C\u522B\u540D\uFF1A{FANSALIAS}
+QY_SEND_CUSTOMERSERVICE_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u54A8\u8BE2\u5355\u7F16\u7801\uFF1A{NUMBER}\uFF0C\u6635\u79F0\uFF1A{NICKNAME}\uFF0C\u522B\u540D\uFF1A{FANSALIAS}\uFF0C\u60A3\u8005\u7C7B\u578B\uFF1A{PATIENTTYPE}
 #\u63A8\u9001\u836F\u5E08\u6D88\u606F\u5BA1\u6279\u54A8\u8BE2\u5355
-QY_SEND_DOCTOR_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u8BF7\u5BA1\u6279\uFF0C\u54A8\u8BE2\u5355\u7F16\u7801\uFF1A{NUMBER}\uFF0C\u6635\u79F0\uFF1A{NICKNAME}\uFF0C\u522B\u540D\uFF1A{FANSALIAS}
+QY_SEND_DOCTOR_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u8BF7\u5BA1\u6279\uFF0C\u54A8\u8BE2\u5355\u7F16\u7801\uFF1A{NUMBER}\uFF0C\u6635\u79F0\uFF1A{NICKNAME}\uFF0C\u522B\u540D\uFF1A{FANSALIAS}\uFF0C\u60A3\u8005\u7C7B\u578B\uFF1A{PATIENTTYPE}
 #\u63A8\u9001\u8BA2\u5355\u5458\u53D1\u8D27\u6D88\u606F
 QY_SEND_ORDERCLERK_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u5F85\u53D1\u8D27\u8BA2\u5355\uFF0C\u8BA2\u5355\u7F16\u7801:
 #\u63A8\u9001\u5BA2\u670D\u8DDF\u8FDB\u63D0\u9192\u6D88\u606F
@@ -109,7 +109,7 @@ APP_SECRET=7625624CC1DF4AB7
 KAIHUHANG_ADDRESS=\u6C5F\u82CF\u94F6\u884C\u626C\u5DDE\u5510\u57CE\u652F\u884C 90160188000128434
 CLERK=\u5415\u5029
 CHECKER=\u7530\u59DD
-PAYEE=\u6C6A\u8A00\u52C7
+PAYEE=\u7530\u59DD
 #\u5F00\u53D1\u7968\u63A5\u53E3
 INVOICE_API=nuonuo.ElectronInvoice.requestBillingNew
 #\u67E5\u8BE2\u53D1\u7968\u63A5\u53E3

membercard-modules/member-module/src/main/java/com/cftech/member/dao/MemberMapper.xml

@@ -206,12 +206,12 @@
         member.id,
         member.number,
         member.name,
-        CONVERT(AES_DECRYPT(member.phone,'aideakey') USING UTF8) member.phone,
+        CONVERT(AES_DECRYPT(member.phone,'aideakey') USING UTF8) phone,
         member.imageurl,
         member.member_id,
         member.accounts_id,
         member.del_flag,
-        member. STATUS,
+        member.status,
         member.create_time,
         member.update_time,
         member.description,

membercard-modules/member-module/src/main/java/com/cftech/member/web/MemberController.java

@@ -239,7 +239,7 @@ public class MemberController {
         Long accountsId = UserUtils.getmpaccounts(request);
         User user = UserUtils.getUser();
         //是否拥有药店主管角色  sys:leaders
-        boolean leader = roleService.selectRoleEntityByUserId(user.getId(), Constants.SYSTEM_LEADER);
+        boolean leader = roleService.selectRoleEntityByUserId(user.getUserid(), Constants.SYSTEM_LEADER);
 
         Conds conds = new Conds();
         conds.equal("m.del_flag", Constants.DEL_FLAG_0);
@@ -429,7 +429,7 @@ public class MemberController {
         conds.equal("m.del_flag", Constants.DEL_FLAG_0);
 
         //是否拥有药店主管角色  sys:leaders
-        boolean leader = roleService.selectRoleEntityByUserId(user.getId(), Constants.SYSTEM_LEADER);
+        boolean leader = roleService.selectRoleEntityByUserId(user.getUserid(), Constants.SYSTEM_LEADER);
         //权限控制
         if (user.getId() != 1 && !leader) {
             //获取当前人对应的审核部门
@@ -513,7 +513,7 @@ public class MemberController {
         conds.equal("m.del_flag", Constants.DEL_FLAG_0);
 
         //是否拥有药店主管角色  sys:leaders
-        boolean leader = roleService.selectRoleEntityByUserId(user.getId(), Constants.SYSTEM_LEADER);
+        boolean leader = roleService.selectRoleEntityByUserId(user.getUserid(), Constants.SYSTEM_LEADER);
         //权限控制
         if (user.getId() != 1 && !leader) {
             //获取当前人对应的审核部门

membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/web/AddressController.java

@@ -73,8 +73,12 @@ public class AddressController {
                 if (StringUtils.isNotBlank(address.getPhone()) && address.getPhone().length() == 11) {
                     address.setPhone(address.getPhone().substring(0, 3) + "****" + address.getPhone().substring(7, address.getPhone().length()));
                 }
-                if (StringUtils.isNotBlank(address.getAddress()) && address.getAddress().length() >= 5) {
-                    address.setAddress("****" + address.getAddress().substring(4, address.getAddress().length()));
+                if (StringUtils.isNotBlank(address.getAddress())) {
+                    String adsStr = "";
+                    for (int i=0; i<address.getAddress().length(); i++) {
+                        adsStr += "*";
+                    }
+                    address.setAddress(adsStr);
                 }
                 model.addAttribute("data", address);
             }

sys-module/src/main/java/com/cftech/sys/dao/RoleMapper.xml

@@ -349,7 +349,8 @@
             COUNT(1)
         FROM role r
         INNER JOIN user_role ur ON r.id = ur.role_id
-        WHERE r.delflag = 0 AND user_id = #{userId, jdbcType=BIGINT} AND role_sign = #{roleSign, jdbcType=VARCHAR}
+        INNER JOIN user usr ON ur.user_id = usr.id
+        WHERE r.delflag = 0 AND usr.userid = #{userId, jdbcType=BIGINT} AND role_sign = #{roleSign, jdbcType=VARCHAR}
     </select>
     
     <!--<select id="getRoleByIds" resultMap="BaseResultMap" parameterType="string">-->