Merge branch 'dev_v2.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicMessageServiceImpl.java

@@ -58,56 +58,57 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
         String templateContent = enumInfo.get("templateContent");
 
         String errorMessage = null;
+        if (SystemConstant.strNotNull(mobileNumber)){
+            try {
+                // 其他方法调用所传入的参数，必须校验有值
+                this.checkData(userId, variableParams, messageType);
 
-        try {
-            // 其他方法调用所传入的参数，必须校验有值
-            this.checkData(userId, mobileNumber, variableParams, messageType);
-
-            // 短信提示系统是否启用配置验证
-            SysConfig sysConfig = sysConfigService.getByKey("sys.message.enable");
-            if (sysConfig == null) {
-                throw ExceptionResultEnum.ERROR.exception("未找到短信配置");
-            }
-            if (sysConfig.getConfigValue() == null) {
-                throw ExceptionResultEnum.ERROR.exception("短信消息提示启用开关未设置");
-            }
-            if (sysConfig.getConfigValue().equals("false")) {
-                throw ExceptionResultEnum.ERROR.exception("短信消息提示已关闭");
-            }
+                // 短信提示系统是否启用配置验证
+                SysConfig sysConfig = sysConfigService.getByKey("sys.message.enable");
+                if (sysConfig == null) {
+                    throw ExceptionResultEnum.ERROR.exception("未找到短信配置");
+                }
+                if (sysConfig.getConfigValue() == null) {
+                    throw ExceptionResultEnum.ERROR.exception("短信消息提示启用开关未设置");
+                }
+                if (sysConfig.getConfigValue().equals("false")) {
+                    throw ExceptionResultEnum.ERROR.exception("短信消息提示已关闭");
+                }
 
-            SendSmsResponse sendSmsResponse = sendSms(mobileNumber, templateCode, variableParams);
+                SendSmsResponse sendSmsResponse = sendSms(mobileNumber, templateCode, variableParams);
 
-            if (sendSmsResponse.getCode() != null) {
+                if (sendSmsResponse.getCode() != null) {
 
-                basicMessage.setSendStatus(sendSmsResponse.getCode());
-                basicMessage.setSendResult(sendSmsResponse.getMessage());
+                    basicMessage.setSendStatus(sendSmsResponse.getCode());
+                    basicMessage.setSendResult(sendSmsResponse.getMessage());
 
-            } else {
-                throw ExceptionResultEnum.ERROR.exception(sendSmsResponse.getMessage());
-            }
-        } catch (Exception e) {
-            errorMessage = e.getMessage();
-        } finally {
-            // 传入的必填字段
-            basicMessage.setUserId(userId);
-            basicMessage.setMobileNumber(mobileNumber);
-            basicMessage.setBusinessId(businessId);
-            basicMessage.setVariableParams(variableParams);
-            basicMessage.setCreateId(createId);
-            basicMessage.setMessageType(messageType);
-            basicMessage.setRemark(remark);
-            basicMessage.setResendCount(0);
+                } else {
+                    throw ExceptionResultEnum.ERROR.exception(sendSmsResponse.getMessage());
+                }
+            } catch (Exception e) {
+                errorMessage = e.getMessage();
+            } finally {
+                // 传入的必填字段
+                basicMessage.setUserId(userId);
+                basicMessage.setMobileNumber(mobileNumber);
+                basicMessage.setBusinessId(businessId);
+                basicMessage.setVariableParams(variableParams);
+                basicMessage.setCreateId(createId);
+                basicMessage.setMessageType(messageType);
+                basicMessage.setRemark(remark);
+                basicMessage.setResendCount(0);
 
-            // 经过处理的新字段
-            basicMessage.setId(SystemConstant.getDbUuid());
-            basicMessage.setBusinessOperate(messageType.getName());
-            basicMessage.setCreateTime(System.currentTimeMillis());
-            basicMessage.setTemplateCode(templateCode);
-            if (errorMessage != null && errorMessage.length() > 0) {
-                basicMessage.setSendStatus("SYSTEM_ERROR");
-                basicMessage.setSendResult(errorMessage);
+                // 经过处理的新字段
+                basicMessage.setId(SystemConstant.getDbUuid());
+                basicMessage.setBusinessOperate(messageType.getName());
+                basicMessage.setCreateTime(System.currentTimeMillis());
+                basicMessage.setTemplateCode(templateCode);
+                if (errorMessage != null && errorMessage.length() > 0) {
+                    basicMessage.setSendStatus("SYSTEM_ERROR");
+                    basicMessage.setSendResult(errorMessage);
+                }
+                this.save(basicMessage);
             }
-            this.save(basicMessage);
         }
     }
 

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -449,14 +449,20 @@
                 and a.paper_number = #{paperNumber}
             </if>
             <if test="startTime != null and startTime != ''">
-                and a.create_time &gt;= #{startTime}
+                AND if(g.update_time != '',g.update_time >= #{startTime},a.update_time >= #{startTime})
             </if>
             <if test="endTime != null and endTime != ''">
-                and a.create_time &lt;= #{endTime}
+                AND if(g.update_time != '',#{endTime} >= g.update_time,#{endTime} >= a.update_time)
             </if>
             <if test="containsQuestionTeacher">
                 and a.user_id = #{userId}
             </if>
+            <if test="cardRuleId != null and cardRuleId != ''">
+                and a.card_rule_id = #{cardRuleId}
+            </if>
+            <if test="makeMethod != null">
+                and f.make_method = #{makeMethod}
+            </if>
             <if test="!containsQuestionTeacher and orgIds != null">
                 AND d.org_id IN
                 <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">