Commit c57b4267ddedea585d8f97156113eea47d9040e6
1 parent
929df81c28
Exists in
master
and in
6 other branches
改bug
Showing 2 changed files with 136 additions and 12 deletions
.idea/uiDesigner.xml
View file @
c57b426
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | +<project version="4"> | |
| 3 | + <component name="Palette2"> | |
| 4 | + <group name="Swing"> | |
| 5 | + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> | |
| 6 | + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> | |
| 7 | + </item> | |
| 8 | + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> | |
| 9 | + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> | |
| 10 | + </item> | |
| 11 | + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> | |
| 12 | + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> | |
| 13 | + </item> | |
| 14 | + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> | |
| 15 | + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> | |
| 16 | + </item> | |
| 17 | + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 18 | + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> | |
| 19 | + <initial-values> | |
| 20 | + <property name="text" value="Button" /> | |
| 21 | + </initial-values> | |
| 22 | + </item> | |
| 23 | + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 24 | + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> | |
| 25 | + <initial-values> | |
| 26 | + <property name="text" value="RadioButton" /> | |
| 27 | + </initial-values> | |
| 28 | + </item> | |
| 29 | + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 30 | + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> | |
| 31 | + <initial-values> | |
| 32 | + <property name="text" value="CheckBox" /> | |
| 33 | + </initial-values> | |
| 34 | + </item> | |
| 35 | + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> | |
| 36 | + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> | |
| 37 | + <initial-values> | |
| 38 | + <property name="text" value="Label" /> | |
| 39 | + </initial-values> | |
| 40 | + </item> | |
| 41 | + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> | |
| 42 | + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> | |
| 43 | + <preferred-size width="150" height="-1" /> | |
| 44 | + </default-constraints> | |
| 45 | + </item> | |
| 46 | + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> | |
| 47 | + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> | |
| 48 | + <preferred-size width="150" height="-1" /> | |
| 49 | + </default-constraints> | |
| 50 | + </item> | |
| 51 | + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> | |
| 52 | + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> | |
| 53 | + <preferred-size width="150" height="-1" /> | |
| 54 | + </default-constraints> | |
| 55 | + </item> | |
| 56 | + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> | |
| 57 | + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> | |
| 58 | + <preferred-size width="150" height="50" /> | |
| 59 | + </default-constraints> | |
| 60 | + </item> | |
| 61 | + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> | |
| 62 | + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> | |
| 63 | + <preferred-size width="150" height="50" /> | |
| 64 | + </default-constraints> | |
| 65 | + </item> | |
| 66 | + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> | |
| 67 | + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> | |
| 68 | + <preferred-size width="150" height="50" /> | |
| 69 | + </default-constraints> | |
| 70 | + </item> | |
| 71 | + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> | |
| 72 | + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> | |
| 73 | + </item> | |
| 74 | + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 75 | + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> | |
| 76 | + <preferred-size width="150" height="50" /> | |
| 77 | + </default-constraints> | |
| 78 | + </item> | |
| 79 | + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 80 | + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> | |
| 81 | + <preferred-size width="150" height="50" /> | |
| 82 | + </default-constraints> | |
| 83 | + </item> | |
| 84 | + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 85 | + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> | |
| 86 | + <preferred-size width="150" height="50" /> | |
| 87 | + </default-constraints> | |
| 88 | + </item> | |
| 89 | + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 90 | + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> | |
| 91 | + <preferred-size width="200" height="200" /> | |
| 92 | + </default-constraints> | |
| 93 | + </item> | |
| 94 | + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> | |
| 95 | + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> | |
| 96 | + <preferred-size width="200" height="200" /> | |
| 97 | + </default-constraints> | |
| 98 | + </item> | |
| 99 | + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> | |
| 100 | + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> | |
| 101 | + </item> | |
| 102 | + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 103 | + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> | |
| 104 | + </item> | |
| 105 | + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> | |
| 106 | + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> | |
| 107 | + </item> | |
| 108 | + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 109 | + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> | |
| 110 | + </item> | |
| 111 | + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> | |
| 112 | + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> | |
| 113 | + <preferred-size width="-1" height="20" /> | |
| 114 | + </default-constraints> | |
| 115 | + </item> | |
| 116 | + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> | |
| 117 | + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> | |
| 118 | + </item> | |
| 119 | + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> | |
| 120 | + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> | |
| 121 | + </item> | |
| 122 | + </group> | |
| 123 | + </component> | |
| 124 | +</project> |
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
View file @
c57b426
| ... | ... | @@ -648,18 +648,18 @@ |
| 648 | 648 | </select> |
| 649 | 649 | |
| 650 | 650 | |
| 651 | - <select id="findMulitPatientCount" parameterType="list" resultType="int"> | |
| 652 | - select sum(a.mulit_patient_count) as count from ( | |
| 653 | - select (count(1) - 1) as mulit_patient_count, a.user_id as count from ( | |
| 654 | - select a.ymd, a.user_id from ( | |
| 655 | - select DATE_FORMAT(create_date, '%Y-%m-%d') as ymd, user_id from coupon_info | |
| 656 | - where user_id in | |
| 657 | - <foreach collection="list" open="(" close=")" separator="," item="uid"> | |
| 658 | - #{uid} | |
| 659 | - </foreach> | |
| 660 | - ) a group by a.ymd, a.user_id | |
| 661 | - ) a group by a.user_id | |
| 662 | - ) a | |
| 651 | + <select id="findMulitPatienInfo" parameterType="list" resultType="map"> | |
| 652 | + select count(1) as count, a.user_id as user_id from ( | |
| 653 | + select a.ymd, a.user_id from ( | |
| 654 | + select DATE_FORMAT(create_date, '%Y-%m-%d') as ymd, user_id | |
| 655 | + from coupon_info | |
| 656 | + where user_id in | |
| 657 | + <foreach collection="list" open="(" close=")" separator="," item="uid"> | |
| 658 | + #{uid} | |
| 659 | + </foreach> | |
| 660 | + order by create_date desc | |
| 661 | + ) a group by a.ymd, a.user_id | |
| 662 | + ) a group by a.user_id | |
| 663 | 663 | </select> |
| 664 | 664 | </mapper> |